diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
index e1d36b4c400..7e7b9f0a619 100755
--- a/.devcontainer/build.sh
+++ b/.devcontainer/build.sh
@@ -76,7 +76,7 @@ if [ "$USER_UID" = "0" ]; then
     USER_UID=1000
 fi
 
-docker build \
+docker buildx build \
     -t "$IMAGE_TAG" \
     --pull \
     --build-arg USER_UID="$USER_UID" \
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index b0a6eb9925e..fd96e9af7aa 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -403,6 +403,8 @@ deployable
 depottools
 deps
 der
+dereference
+dereferencing
 desc
 descheduled
 detokenization
@@ -550,6 +552,7 @@ EvalCode
 EvalCodeWithName
 EvalFrameDefault
 EVB
+EVKBMIMXRT
 EventLogging
 evk
 EVSE
@@ -608,6 +611,7 @@ fsl
 fstab
 fsync
 ftd
+ftr
 fullclean
 fuzzer
 fuzzers
@@ -1118,6 +1122,7 @@ params
 PartNumber
 PASE
 Passcode
+passcodes
 passRetained
 passwd
 Pausable
@@ -1369,6 +1374,7 @@ Silabs's
 SiliconLabs
 SimpleFileExFlags
 SimpleLink
+simw
 SiWx
 sizedb
 sl
diff --git a/.github/ISSUE_TEMPLATE/001-bug-report.yaml b/.github/ISSUE_TEMPLATE/001-bug-report.yaml
index 8944e002c5e..e8b8646a055 100644
--- a/.github/ISSUE_TEMPLATE/001-bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/001-bug-report.yaml
@@ -51,6 +51,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf
               - python
               - raspi
diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index 10551fef60f..45c9e1ea114 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -51,6 +51,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
index 50db3e80a95..9a6b3bf80c1 100644
--- a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
@@ -51,6 +51,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf connect
         - nrf
         - python
diff --git a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
index 81b641a52e4..ef2472d325d 100644
--- a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
@@ -51,6 +51,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf connect
         - nrf
         - python
diff --git a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
index 5c91f91e75b..3be4a5f016f 100644
--- a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
@@ -51,6 +51,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf connect
         - nrf
         - python
diff --git a/.github/ISSUE_TEMPLATE/049-trivial-fix.yaml b/.github/ISSUE_TEMPLATE/049-trivial-fix.yaml
index 7c82d950e9f..a8bf9d85f99 100644
--- a/.github/ISSUE_TEMPLATE/049-trivial-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/049-trivial-fix.yaml
@@ -42,6 +42,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
index 0d775a61ef1..8dddd0a064a 100644
--- a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
@@ -37,6 +37,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
index fdb8b76d88f..ad9bd8abb62 100644
--- a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
@@ -37,6 +37,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/080-feature-request.yaml b/.github/ISSUE_TEMPLATE/080-feature-request.yaml
index c83b0c22aca..118c763eee3 100644
--- a/.github/ISSUE_TEMPLATE/080-feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/080-feature-request.yaml
@@ -32,6 +32,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/090-sve-issue.yaml b/.github/ISSUE_TEMPLATE/090-sve-issue.yaml
index 6ea65341230..20436b77c74 100644
--- a/.github/ISSUE_TEMPLATE/090-sve-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/090-sve-issue.yaml
@@ -51,6 +51,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
index 659135117d1..c2db0c59004 100644
--- a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
+++ b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
@@ -85,6 +85,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf
         - python
         - raspi
diff --git a/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml b/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
index a99f5a63617..280309e9eed 100644
--- a/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
+++ b/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
@@ -34,6 +34,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf connect
         - nrf
         - python
diff --git a/.github/ISSUE_TEMPLATE/098-build-issue.yaml b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
index 5d1adb35548..4bd88bffed0 100644
--- a/.github/ISSUE_TEMPLATE/098-build-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
@@ -34,6 +34,7 @@ body:
         - freeRTOS
         - IMX8
         - k32w
+        - linux
         - nrf connect
         - nrf
         - python
diff --git a/.github/ISSUE_TEMPLATE/099-github-workflow-issue.yaml b/.github/ISSUE_TEMPLATE/099-github-workflow-issue.yaml
index eefa5f0f984..337d334df47 100644
--- a/.github/ISSUE_TEMPLATE/099-github-workflow-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/099-github-workflow-issue.yaml
@@ -34,6 +34,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml b/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
index 51971d1d010..c325312949c 100644
--- a/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
@@ -34,6 +34,7 @@ body:
               - freeRTOS
               - IMX8
               - k32w
+              - linux
               - nrf connect
               - nrf
               - python
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 26dcae00d21..7c3cec524fa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -77,41 +77,45 @@ jobs:
                   languages: "cpp"
                   queries: security-extended, security-and-quality
             - name: Setup Build
+              if: github.event.pull_request.number == null
               run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
             - name: Run Build
+              if: github.event.pull_request.number == null
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Run Tests
+              if: github.event.pull_request.number == null
               run: scripts/tests/gn_tests.sh
             - name: Clean out build output
+              if: github.event.pull_request.number == null
               run: rm -rf ./out
 
             # Do not run below steps with CodeQL since we are getting "Out of runner space issues" with CodeQL and their added coverage is limited
             - name: Set up Build Without Detail Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
             - name: Run Build Without Detail Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Cleanout build output
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: rm -rf ./out
             - name: Set up Build Without Progress Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false"
             - name: Run Build Without Progress Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Clean out build output
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: rm -rf ./out
             - name: Set up Build Without Error Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false chip_error_logging=false"
             - name: Run Build Without Error Logging
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Clean out build output
-              if: inputs.run-codeql != true
+              if: inputs.run-codeql != true && github.event.pull_request.number == null
               run: rm -rf ./out
             - name: Set up Build Without Logging
               if: inputs.run-codeql != true
@@ -428,7 +432,7 @@ jobs:
 
     build_darwin:
         name: Build on Darwin (clang, simulated)
-        runs-on: macos-26
+        runs-on: namespace-profile-macos-26
         if: github.actor != 'restyled-io[bot]'  && inputs.run-codeql != true
 
         steps:
@@ -518,7 +522,7 @@ jobs:
 
         env:
             TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
-
+            
         if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
         # [SL-ONLY] Use public runner on our ci
         runs-on: ubuntu-latest
@@ -546,6 +550,8 @@ jobs:
                 apt-get update
                 apt-get install -y --no-install-recommends gnupg
             - name: Upload coverage reports to Codecov with GitHub Action
-              uses: codecov/codecov-action@v5
+              uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+              with:
+                fail_ci_if_error: true
               env:
                 CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/check-data-model-directory-updates.yaml b/.github/workflows/check-data-model-directory-updates.yaml
index f97625bb7af..111056f4c7f 100644
--- a/.github/workflows/check-data-model-directory-updates.yaml
+++ b/.github/workflows/check-data-model-directory-updates.yaml
@@ -70,6 +70,11 @@ jobs:
         run: |
           scripts/run_in_python_env.sh out/venv 'python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.5'
 
+      - name: Check for changes to the 1.6 data_model directory without a SHA update
+        if: (!contains(github.event.pull_request.labels.*.name, 'data-model-file-structural-change-dm-tt-use-only'))
+        run: |
+          scripts/run_in_python_env.sh out/venv 'python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.6'
+
   check-data_model-build-file:
     name: Check that all data_model files are listed in the data_model_xmls.gni build file
     runs-on: ubuntu-latest
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index f0f84a450ca..affcb901c20 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -145,7 +145,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:181
+            image: ghcr.io/project-chip/chip-build-telink:185
             volumes:
                 - "/:/runner-root-volume"
             options: --user root
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index ae80605b600..e4aa128f61e 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: macos-26
+        - os: macos-26    # NOTE: must match `runs-on`
           arch: arm64     # observed, not configured
           dry-run: true
           build_variant: no-ble-no-shell-asan-clang
@@ -56,7 +56,11 @@ jobs:
       LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
     if: github.actor != 'restyled-io[bot]'
-    runs-on: ${{matrix.os}}
+    # Namespace MacOS 26 profile is configured as "26.3 with Xcode 26.2" currently
+    # This is not yet enabled since namespace still has high concurrency limit: we have
+    # 48 cores and are forced to 6 cores minimum.
+    # runs-on: namespace-profile-macos-26
+    runs-on: macos-26
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 5b7d7cc2a6d..5853d1451c1 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -54,85 +54,99 @@ jobs:
         if: ${{ !env.ACT }}
         with:
           gh-context: ${{ toJson(github) }}
+
       - name: Build example BL602 Lighting App
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl602 bl602+mfd+littlefs+rpc lighting-app \
-              out/artifacts/bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc/chip-bl602-lighting-example.out \
+              out/bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc/chip-bl602-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
-      - name: Build example BL702 Lighting App
+      - name: Build example BL702 Lighting App (Ethernet)
+        if: github.event_name != 'pull_request'
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl706dk-light-ethernet-easyflash \
-              --target bouffalolab-bl706dk-light-wifi-littlefs \
-              --target bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-easyflash build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl702+eth lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
+              out/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL702 Lighting App (Wi-Fi)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-wifi-littlefs-shell build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl702+wifi lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-wifi-littlefs/chip-bl702-lighting-example.out \
+              bl702 bl702+eth lighting-app \
+              out/bouffalolab-bl706dk-light-wifi-littlefs-shell/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL702 Lighting App (Thread)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl706+mfd+rpc+littlefs lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc/chip-bl702-lighting-example.out \
+              bl702 bl702+eth lighting-app \
+              out/bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Build example BL702L Lighting App
-        timeout-minutes: 30
+        if: github.event_name != 'pull_request'
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704ldk-light-thread-littlefs-mfd \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light-thread-littlefs-mfd build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702l bl702l+mfd+littlefs lighting-app \
-              out/artifacts/bouffalolab-bl704ldk-light-thread-littlefs-mfd/chip-bl702l-lighting-example.out \
+              out/bouffalolab-bl704ldk-light-thread-littlefs-mfd/chip-bl702l-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Build example BL702L Contact Sensor
-        timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702l bl702l+mfd+littlefs contact-sensor-app \
-              out/artifacts/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
+              out/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Ethernet)
+        if: github.event_name != 'pull_request'
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-ethernet-littlefs-mfd build "
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+ethernet lighting-app \
+              out/bouffalolab-bl616dk-light-ethernet-littlefs-mfd/chip-bl616-lighting-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Wi-Fi)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-wifi-littlefs-mfd-shell build"
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+wifi+shell lighting-app \
+              out/bouffalolab-bl616dk-light-wifi-littlefs-mfd-shell/chip-bl616-lighting-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Thread)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-thread-littlefs-mfd build"
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+thread lighting-app \
+              out/bouffalolab-bl616dk-light-thread-littlefs-mfd/chip-bl616-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Uploading Size Reports
         uses: ./.github/actions/upload-size-reports
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 51d186dc701..054ae344bdf 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -156,6 +156,11 @@ jobs:
                 scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
                 rm -rf examples/lighting-app/esp32/{build,managed_components}
 
+            - name: Build example All Devices App
+              run: |
+                scripts/examples/esp_example.sh all-devices-app sdkconfig.defaults
+                rm -rf examples/all-devices-app/esp32/{build,managed_components}
+
             - name: Build example Energy Gateway App
               if: steps.changed_paths.outputs.energy_gateway == 'true'
               run: |
@@ -203,9 +208,6 @@ jobs:
             - name: Build example Bridge App
               run: scripts/examples/esp_example.sh bridge-app
 
-            - name: Build example All Devices App
-              run: scripts/examples/esp_example.sh all-devices-app sdkconfig.defaults
-
             - name: Build example Persistent Storage App
               run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
 
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
index 0b375ca69fc..633f0f08a74 100644
--- a/.github/workflows/examples-nxp.yaml
+++ b/.github/workflows/examples-nxp.yaml
@@ -181,6 +181,7 @@ jobs:
                       ./scripts/build/build_examples.py \
                       --target nxp-rw61x-zephyr-all-clusters \
                       --target nxp-rw61x-zephyr-thermostat \
+                      --target nxp-rw61x-zephyr-thermostat-thread \
                       --target nxp-rw61x-zephyr-laundry-washer-factory \
                       build \
                   "
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index d99f06446cf..467893f95fc 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:181
+            image: ghcr.io/project-chip/chip-build-telink:185
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -142,12 +142,19 @@ jobs:
 
             - name: Build example Telink (W91) Lighting App with OTA, Factory Data
               # Run test for master and all PRs
+              #
+              # TODO: full logging is not enabled here; logging is reduced to progress/error
+              #       (via the *-log-progress target) because with full logging this runs
+              #       out of flash. This is generally NOT expected/intentional.
+              #       At the time this was checked:
+              #         - a 4K flash increase occurred due to the group cast cluster
+              #         - flash runs out by about 1.2K
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-light-ota-factory-data' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-light-ota-factory-data-log-progress' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     telink tlsr9118bdk40d lighting-app-ota-factory-data \
-                    out/telink-tlsr9118bdk40d-light-ota-factory-data/zephyr/zephyr.elf \
+                    out/telink-tlsr9118bdk40d-light-ota-factory-data-log-progress/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output (keep tools)
@@ -192,14 +199,14 @@ jobs:
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
-            - name: Build example Telink (tl721x) Lighting App with OTA, Shell, Factory Data
+            - name: Build example Telink (tl721x) Lighting App with OTA (LZMA), Shell, Factory Data
               # Run test for master and all PRs
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tl7218x-light-ota-shell-factory-data' build"
+                    "./scripts/build/build_examples.py --target 'telink-tl7218x-light-ota-compress-lzma-shell-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tl7218x light-app-ota-shell-factory-data \
-                    out/telink-tl7218x-light-ota-shell-factory-data/zephyr/zephyr.elf \
+                    telink tl7218x light-app-ota-compress-lzma-shell-factory-data \
+                    out/telink-tl7218x-light-ota-compress-lzma-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output (keep tools)
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index afd0834c711..29de30d592b 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -923,16 +923,16 @@ jobs:
             - name: Build linux-x64-jf-control-app
               run: >-
                   ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
-                  --target linux-x64-jf-control-app
+                  --target linux-x64-jf-control-app-${BUILD_VARIANT}-asan-clang
                   --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
-                  && rm -rf out/linux-x64-jf-control-app"
+                  && rm -rf out/linux-x64-jf-control-app-${BUILD_VARIANT}-asan-clang"
 
             - name: Build linux-x64-jf-admin-app
               run: >-
                   ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
-                  --target linux-x64-jf-admin-app
+                  --target linux-x64-jf-admin-app-${BUILD_VARIANT}-asan-clang
                   --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
-                  && rm -rf out/linux-x64-jf-admin-app"
+                  && rm -rf out/linux-x64-jf-admin-app-${BUILD_VARIANT}-asan-clang"
 
             - name: ccache stats
               run: ccache -s
@@ -1070,8 +1070,8 @@ jobs:
                   echo "FABRIC_ADMIN_APP: objdir-clone/linux-x64-fabric-admin-rpc-${BUILD_VARIANT}-clang/fabric-admin" >> /tmp/test_env.yaml
                   echo "FABRIC_BRIDGE_APP: objdir-clone/linux-x64-fabric-bridge-rpc-${BUILD_VARIANT}-clang/fabric-bridge-app" >> /tmp/test_env.yaml
                   echo "FABRIC_SYNC_APP: objdir-clone/linux-x64-fabric-sync-${BUILD_VARIANT}-clang/fabric-sync" >> /tmp/test_env.yaml
-                  echo "JF_ADMIN_APP: objdir-clone/linux-x64-jf-admin-app/jfa-app" >> /tmp/test_env.yaml
-                  echo "JF_CONTROL_APP: objdir-clone/linux-x64-jf-control-app/jfc-app" >> /tmp/test_env.yaml
+                  echo "JF_ADMIN_APP: objdir-clone/linux-x64-jf-admin-app-${BUILD_VARIANT}-asan-clang/jfa-app" >> /tmp/test_env.yaml
+                  echo "JF_CONTROL_APP: objdir-clone/linux-x64-jf-control-app-${BUILD_VARIANT}-asan-clang/jfc-app" >> /tmp/test_env.yaml
                   echo "LIGHTING_APP_NO_UNIQUE_ID: objdir-clone/linux-x64-light-data-model-no-unique-id-${BUILD_VARIANT}-clang/chip-lighting-app" >> /tmp/test_env.yaml
                   echo "LIT_ICD_APP: objdir-clone/linux-x64-lit-icd-${BUILD_VARIANT}-tsan-clang-test/lit-icd-app" >> /tmp/test_env.yaml
                   echo "NETWORK_MANAGEMENT_APP: objdir-clone/linux-x64-network-manager-${BUILD_VARIANT}-tsan-clang-test/matter-network-manager-app" >> /tmp/test_env.yaml
@@ -1110,6 +1110,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestSpecParsingNamespace.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestSpecParsingSelection.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestSpecParsingSupport.py'
+                  scripts/run_in_python_env.sh out/venv 'scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/test_testing/TestFactoryResetRequests.py'
                   scripts/run_in_python_env.sh out/venv 'PYTHONPATH=src/python_testing:$PYTHONPATH python3 -m unittest discover -s src/python_testing/mdns_discovery/tests -p "test_*.py"'
             - name: Run Tests (individual)
               if: ${{matrix.filter == ''}}
diff --git a/.gitmodules b/.gitmodules
index 986da0122d5..c365b017f31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -227,6 +227,7 @@
 	url = https://github.com/bouffalolab/bl_iot_sdk_tiny.git
 	branch = main
 	platforms = bouffalolab
+	recursive = true
 [submodule "third_party/libwebsockets/repo"]
 	path = third_party/libwebsockets/repo
 	url = https://github.com/warmcat/libwebsockets
@@ -348,6 +349,11 @@
 	path = third_party/uriparser/repo
 	url = https://github.com/uriparser/uriparser.git
 	branch = uriparser-1.0.0
+[submodule "third_party/bouffalolab/repo_bouffalo_sdk"]
+	path = third_party/bouffalolab/repo_bouffalo_sdk
+	url = https://github.com/bouffalolab/bouffalo_sdk.git
+	branch = main
+	platforms = bouffalolab
 [submodule "third_party/silabs/aws_ota_sdk/ota-for-aws-iot-embedded-sdk"]
 	path = third_party/silabs/aws_ota_sdk/ota-for-aws-iot-embedded-sdk
 	url = https://github.com/aws/ota-for-aws-iot-embedded-sdk.git
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index d5c33b8525b..3e6ddc51331 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -447,11 +447,15 @@ config("runtime_default") {
 config("sanitize_address") {
   defines = []
   cflags = [
-    "-fsanitize-coverage=inline-8bit-counters,trace-cmp",
-    "-fno-sanitize-coverage=pc-table",
     "-fsanitize=address",
     "-fno-omit-frame-pointer",
   ]
+  if (is_clang) {
+    cflags += [
+      "-fsanitize-coverage=inline-8bit-counters,trace-cmp",
+      "-fno-sanitize-coverage=pc-table",
+    ]
+  }
   ldflags = cflags
 
   if ((target_os == "mac" || target_os == "ios") && !is_clang) {
@@ -478,6 +482,7 @@ config("sanitize_undefined_behavior") {
     "-fvisibility=hidden",
     "-fsanitize=undefined",
     "-fsanitize=float-divide-by-zero",
+    "-fsanitize=integer-divide-by-zero",
   ]
   if (is_clang) {
     cflags += [
diff --git a/config/common/cmake/Kconfig b/config/common/cmake/Kconfig
index 291d18b3a18..2ff099c1c2b 100644
--- a/config/common/cmake/Kconfig
+++ b/config/common/cmake/Kconfig
@@ -382,6 +382,30 @@ choice CHIP_CRYPTO
 
 endchoice
 
+choice CHIP_CRYPTO_SPAKE2P
+	prompt "CHIP Crypto SPAKE2+ Selection"
+	default CHIP_CRYPTO_SPAKE2P_MBEDTLS
+
+	config CHIP_CRYPTO_SPAKE2P_MBEDTLS
+		bool "SPAKE2+ default mbedtls"
+		help
+			Enables the implementation of the SPAKE2+ protocol
+			based on the mbedTLS crypto API.
+
+	config CHIP_CRYPTO_SPAKE2P_PSA
+		bool "SPAKE2+ default PSA"
+		help
+			Enables the implementation of the SPAKE2+ protocol
+			based on the PSA API.
+
+	config CHIP_CRYPTO_SPAKE2P_CUSTOM
+		bool "SPAKE2+ custom"
+		help
+			Enables the implementation of the SPAKE2+ protocol
+			based on custom API.
+
+endchoice
+
 config CHIP_CRYPTO_PSA_AEAD_SINGLE_PART
     bool "Use PSA AEAD single-part API"
     depends on CHIP_CRYPTO_PSA
diff --git a/config/common/cmake/chip_gn_kconfig_defaults.cmake b/config/common/cmake/chip_gn_kconfig_defaults.cmake
index 29dae8faffa..ad87b499dea 100644
--- a/config/common/cmake/chip_gn_kconfig_defaults.cmake
+++ b/config/common/cmake/chip_gn_kconfig_defaults.cmake
@@ -30,7 +30,7 @@ matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_INET_E
 matter_add_gn_arg_bool("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
 matter_add_gn_arg_bool("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
 matter_add_gn_arg_bool("chip_detail_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
-matter_add_gn_arg_bool("chip_automation_logging" FALSE)
+matter_add_gn_arg_bool("chip_automation_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 5)
 matter_add_gn_arg_bool("chip_malloc_sys_heap" CONFIG_CHIP_MALLOC_SYS_HEAP)
 matter_add_gn_arg_bool("chip_enable_wifi" CONFIG_CHIP_WIFI)
 matter_add_gn_arg_bool("chip_enable_ethernet" CONFIG_CHIP_ETHERNET)
@@ -50,6 +50,7 @@ if(CONFIG_NET_L2_OPENTHREAD)
     matter_add_gn_arg("chip_device_config_thread_network_endpoint_id" ${CONFIG_CHIP_THREAD_NETWORK_ENDPOINT_ID})
     matter_add_gn_arg_bool("chip_openthread_ftd" CONFIG_CHIP_OPENTHREAD_FTD)
     matter_add_gn_arg_bool("chip_system_config_use_openthread_inet_endpoints" CONFIG_CHIP_USE_OT_ENDPOINT)
+    matter_add_gn_arg_bool ("chip_system_config_use_sockets" NOT CONFIG_CHIP_USE_OT_ENDPOINT AND NOT CONFIG_CHIP_WITH_LWIP)
 endif()
 
 if(CONFIG_DEBUG)
@@ -74,6 +75,14 @@ elseif(CONFIG_CHIP_CRYPTO_PSA)
     matter_add_gn_arg_string("chip_crypto" "psa")
 endif()
 
+if(CONFIG_CHIP_CRYPTO_SPAKE2P_MBEDTLS)
+    matter_add_gn_arg_string("chip_crypto_spake2p" "mbedtls")
+elseif(CONFIG_CHIP_CRYPTO_SPAKE2P_PSA)
+    matter_add_gn_arg_string("chip_crypto_spake2p" "psa")
+elseif(CONFIG_CHIP_CRYPTO_SPAKE2P_CUSTOM)
+    matter_add_gn_arg_string("chip_crypto_spake2p" "custom")
+endif()
+
 if(NOT CONFIG_CHIP_DEBUG_SYMBOLS)
     matter_add_gn_arg_string("symbol_level" "0")
 endif()
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
index 205391c8b19..2337e292f3e 100644
--- a/config/nrfconnect/chip-module/CMakeLists.txt
+++ b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -192,11 +192,15 @@ endif()
 
 if (CONFIG_CHIP_CRYPTO_PSA)
     matter_add_gn_arg_string("chip_crypto"                      "psa")
-    matter_add_gn_arg_bool  ("chip_crypto_psa_spake2p"          CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
     matter_add_gn_arg_bool  ("chip_crypto_psa_aead_single_part" CONFIG_CHIP_CRYPTO_PSA_AEAD_SINGLE_PART)
     matter_add_gn_arg_bool  ("chip_use_cracen_kmu"              CONFIG_CHIP_STORE_KEYS_IN_KMU)
 endif()
 
+
+if(CONFIG_CHIP_CRYPTO_PSA AND CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
+    matter_add_gn_arg_string("chip_crypto_spake2p" "psa")
+endif()
+
 if (BOARD STREQUAL "native_sim")
     matter_add_gn_arg_string("target_cpu" "x86")
 elseif (BOARD STREQUAL "native_sim/native/64")
diff --git a/config/nxp/chip-cmake-freertos/Kconfig b/config/nxp/chip-cmake-freertos/Kconfig
index ace3c5512bb..80c93763e71 100644
--- a/config/nxp/chip-cmake-freertos/Kconfig
+++ b/config/nxp/chip-cmake-freertos/Kconfig
@@ -159,37 +159,32 @@ config CHIP_SE05X_RND_GEN
 	help
 		Enable SE05x Secure element for offloading random number generation.
 
-config CHIP_SE05X_GENERATE_EC_KEY
-	bool "Enable SE05x Secure element for EC key Generate"
-	default y
-	help
-		Enable SE05x Secure element for EC key Generate.
-
-config CHIP_SE05X_ECDSA_VERIFY
-	bool "Enable SE05x Secure element for ECDSA Verify"
-	default y
-	help
-		Enable SE05x Secure element for ECDSA Verify.
-
-config CHIP_SE05X_PBKDF2_SHA256
-	bool "Enable SE05x Secure element for PBKDF2_SHA256"
+config CHIP_SE05X_DEVICE_ATTESTATION
+	bool "Enable SE05x Secure element for offloading Device attestation Sign"
 	help
-		Enable SE05x Secure element for PBKDF2_SHA256.
+		Enable SE05x Secure element for offloading Device attestation Sign.
 
-config CHIP_SE05X_HKDF_SHA256
-	bool "Enable SE05x Secure element for HKDF_SHA256"
+config CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+	bool "Enable SE05x Secure element for offloading spake verifier and use the trust provisioned w0 and L values"
+	depends on CHIP_SE05X_SPAKE_VERIFIER
+	depends on CHIP_FACTORY_DATA
+	default n
 	help
-		Enable SE05x Secure element for HKDF_SHA256.
+		Enable SE05x Secure element for offloading spake verifier and use the trust provisioned w0 and L values. This
+		should be enable only if factory data is configured.
 
-config CHIP_SE05X_HMAC_SHA256
-	bool "Enable SE05x Secure element for HMAC_SHA256"
+config CHIP_SE05X_SPAKE_VERIFIER_TP_SET_NO
+	int "SE05x Trust Provisioned spake verifier set number"
+	default 1
+	range 1 3
 	help
-		Enable SE05x Secure element for HMAC_SHA256.
+		SE05x Trust Provisioned spake verifier set number.
 
-config CHIP_SE05X_DEVICE_ATTESTATION
-	bool "Enable SE05x Secure element for offloading Device attestation Sign"
+config CHIP_SE05X_SPAKE_VERIFIER_TP_ITER_CNT
+	int "SE05x Trust Provisioned spake verifier iteration count"
+	default 1000
 	help
-		Enable SE05x Secure element for offloading Device attestation Sign.
+		SE05x Trust Provisioned spake verifier iteration count.
 
 endif # CHIP_SE05X
 
diff --git a/config/nxp/chip-cmake-freertos/Kconfig.defaults b/config/nxp/chip-cmake-freertos/Kconfig.defaults
index 4cac8e3e95b..e4983a6041b 100644
--- a/config/nxp/chip-cmake-freertos/Kconfig.defaults
+++ b/config/nxp/chip-cmake-freertos/Kconfig.defaults
@@ -29,6 +29,10 @@ choice CHIP_CRYPTO
 	default CHIP_CRYPTO_MBEDTLS if CHIP_NXP_PLATFORM_RW61X || CHIP_NXP_PLATFORM_RT1170 || CHIP_NXP_PLATFORM_RT1060
 endchoice
 
+choice CHIP_CRYPTO_SPAKE2P
+     default CHIP_CRYPTO_SPAKE2P_CUSTOM if CHIP_NXP_PLATFORM_MCXW72 && CHIP_CRYPTO_PSA
+endchoice
+
 config CHIP_WIFI
 	default y if CHIP_NXP_PLATFORM_RW61X || CHIP_NXP_PLATFORM_RT1170 || CHIP_NXP_PLATFORM_RT1060
 
@@ -51,6 +55,7 @@ config CHIP_IPV4
 
 config CHIP_TASK_STACK_SIZE
 	default 13000 if CHIP_SE05X  # Increase is do to the additional middle-ware APDU buffers
+	default 6144 if CHIP_NXP_PLATFORM_MCXW72
 	default 10240
 
  config CHIP_INET_ENABLE_TCP_ENDPOINT
diff --git a/config/nxp/chip-module/Kconfig.defaults b/config/nxp/chip-module/Kconfig.defaults
index fa4d14355bc..e069b7c6132 100644
--- a/config/nxp/chip-module/Kconfig.defaults
+++ b/config/nxp/chip-module/Kconfig.defaults
@@ -103,9 +103,23 @@ config LOG
 if LOG
 
 choice LOG_MODE
-	default LOG_MODE_MINIMAL
+	default LOG_MODE_MINIMAL if !NET_L2_OPENTHREAD
+	default LOG_MODE_DEFERRED
 endchoice
 
+if LOG_MODE_DEFERRED
+
+config LOG_BACKEND_UART
+	default y
+
+config SHELL_LOG_BACKEND
+	default n
+
+endif # LOG_MODE_DEFERRED
+
+config LOG_BUFFER_SIZE
+	default 6144 if NET_L2_OPENTHREAD
+
 choice MATTER_LOG_LEVEL_CHOICE
 	default MATTER_LOG_LEVEL_DBG
 endchoice
@@ -152,6 +166,7 @@ config POSIX_MAX_FDS
 
 # Application stack size
 config MAIN_STACK_SIZE
+	default 6144 if NET_L2_OPENTHREAD
 	default 3072
 
 config INIT_STACKS
@@ -219,6 +234,60 @@ config NET_BUF_TX_COUNT
 config NET_BUF_DATA_SIZE
 	default 256
 
+if NET_L2_OPENTHREAD
+
+config HDLC_RCP_IF
+	default y if SOC_FAMILY_NXP_RW
+
+config OPENTHREAD_THREAD_STACK_SIZE
+    default 6144
+
+# Use the platform-provided heap
+config OPENTHREAD_EXTERNAL_HEAP
+	default y
+
+# Enable ping sender feature
+config OPENTHREAD_PING_SENDER
+	default y
+
+# Enable SLAAC feature for IPv6 address auto-configuration
+config OPENTHREAD_SLAAC
+	default y
+
+# Increase number of message buffers in the buffer pool
+config OPENTHREAD_NUM_MESSAGE_BUFFERS
+	default 256
+
+# Enable IPv6 fragmentation support
+config OPENTHREAD_IP6_FRAGM
+	default y
+
+choice OPENTHREAD_LOG_LEVEL_CHOICE
+	default OPENTHREAD_LOG_LEVEL_DEBG
+endchoice
+
+choice OPENTHREAD_STACK_VERSION
+	default OPENTHREAD_THREAD_VERSION_1_4
+endchoice
+
+config OPENTHREAD_PARENT_SEARCH
+	default y
+
+if OPENTHREAD_PARENT_SEARCH
+
+config OPENTHREAD_PARENT_SEARCH_RSS_THRESHOLD
+	default -45
+
+endif # OPENTHREAD_PARENT_SEARCH
+
+config OPENTHREAD_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH
+	default y
+
+config CHIP_USE_OT_ENDPOINT
+	default y
+
+endif # NET_L2_OPENTHREAD
+
 # Bluetooth Low Energy configs
 
 config BT
@@ -271,6 +340,7 @@ config BT_BUF_ACL_TX_SIZE
 	default 251
 
 config BT_RX_STACK_SIZE
+	default 2560 if NET_L2_OPENTHREAD
 	default 2048 if NO_OPTIMIZATIONS && DEBUG
 	default 1700
 
@@ -371,9 +441,6 @@ config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
 config WIFI_NM_WPA_SUPPLICANT_INF_MON
 	default n
 
-config SYSTEM_WORKQUEUE_STACK_SIZE
-	default 2048
-
 config NET_TCP_WORKQ_STACK_SIZE
 	default 2048
 
@@ -413,28 +480,31 @@ config NET_MAX_ROUTERS
 config NET_MAX_CONN
 	default 10
 
+config ETH_DRIVER
+	default n
+
+endif
+
 config SHELL_STACK_SIZE
 	default 1536
 
+config LOG_PROCESS_THREAD_STACK_SIZE
+	default 1536
+
 config HEAP_MEM_POOL_SIZE
 	default 122880
 
 config CHIP_MALLOC_SYS_HEAP_SIZE
 	default 28672 # 28 kB
 
-config ETH_DRIVER
-	default n
-
-endif
-
-if CHIP_ETHERNET || CHIP_WIFI
+config SYSTEM_WORKQUEUE_STACK_SIZE
+	default 3072 if NET_L2_OPENTHREAD
+	default 2048 if CHIP_WIFI
 
 choice LIBC_IMPLEMENTATION
 	default NEWLIB_LIBC
 endchoice
 
-endif
-
 if CHIP_ETHERNET
 
 config NET_SOCKETS_POLL_MAX
diff --git a/config/nxp/chip-module/Kconfig.features b/config/nxp/chip-module/Kconfig.features
index e389a91a47b..7cc7e7d2dcf 100644
--- a/config/nxp/chip-module/Kconfig.features
+++ b/config/nxp/chip-module/Kconfig.features
@@ -21,7 +21,7 @@ if CHIP
 
 # See config/common/cmake/Kconfig for full definition
 config CHIP_WIFI
-	default y
+	default y if !NET_L2_OPENTHREAD
 	select WIFI
 	select WIFI_NXP
 	select WIFI_NM_WPA_SUPPLICANT
diff --git a/config/nxp/cmake/Kconfig.matter.nxp b/config/nxp/cmake/Kconfig.matter.nxp
index bbdf7ff3d25..661090e86ca 100644
--- a/config/nxp/cmake/Kconfig.matter.nxp
+++ b/config/nxp/cmake/Kconfig.matter.nxp
@@ -116,6 +116,16 @@ config CHIP_ENABLE_SECURE_WHOLE_FACTORY_DATA
 	help
 		This mode allows to protect the matter factory dataset with a AES key protected in the secure element.
 
+config CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
+	bool "Custom factory data provider singleton implementation"
+	default y if CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES || CHIP_SE05X_DEVICE_ATTESTATION
+	help
+		Allows to use a custom factory data provider singleton implementation.
+		If enabled, the user must define a custom singleton implementation.
+		Such feature is useful when an application needs to customize the factory data provider behavior.
+		The application can provide its own singleton, for example by creating
+		a class that inherits from FactoryDataProviderImpl and overrides only the methods that need customization.
+
 endif
 
 if CHIP_FACTORY_DATA_BUILD
diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
index fb2d0606e3b..459d2a9aae2 100644
--- a/config/telink/chip-module/CMakeLists.txt
+++ b/config/telink/chip-module/CMakeLists.txt
@@ -132,6 +132,29 @@ if (CONFIG_CHIP_ROTATING_DEVICE_ID)
     matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
 endif()
 
+if(${TLNK_LOG_LEVEL} MATCHES all)
+  matter_add_gn_arg_bool("chip_logging"            TRUE)
+  matter_add_gn_arg_bool("chip_error_logging"      TRUE)
+  matter_add_gn_arg_bool("chip_progress_logging"   TRUE)
+  matter_add_gn_arg_bool("chip_detail_logging"     TRUE)
+  matter_add_gn_arg_bool("chip_automation_logging" TRUE)
+elseif(${TLNK_LOG_LEVEL} MATCHES progress)
+  matter_add_gn_arg_bool("chip_logging"            TRUE)
+  matter_add_gn_arg_bool("chip_error_logging"      TRUE)
+  matter_add_gn_arg_bool("chip_progress_logging"   TRUE)
+  matter_add_gn_arg_bool("chip_detail_logging"     FALSE)
+  matter_add_gn_arg_bool("chip_automation_logging" FALSE)
+elseif(${TLNK_LOG_LEVEL} MATCHES error)
+  matter_add_gn_arg_bool("chip_logging"            TRUE)
+  matter_add_gn_arg_bool("chip_error_logging"      TRUE)
+  matter_add_gn_arg_bool("chip_progress_logging"   FALSE)
+  matter_add_gn_arg_bool("chip_detail_logging"     FALSE)
+  matter_add_gn_arg_bool("chip_automation_logging" FALSE)
+elseif(${TLNK_LOG_LEVEL} MATCHES none)
+  matter_add_gn_arg_bool("chip_logging" FALSE)
+endif()
+
+
 if (CONFIG_WIFI_W91)
     matter_add_gn_arg_string("chip_mdns" "minimal")
 elseif (CONFIG_NET_L2_OPENTHREAD)
diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
index 3534cbdb391..7c876c58d71 100644
--- a/config/zephyr/Kconfig
+++ b/config/zephyr/Kconfig
@@ -51,6 +51,7 @@ config CHIP_OTA_REQUESTOR_REBOOT_ON_APPLY
 # See config/common/cmake/Kconfig for full definition
 config CHIP_LIB_SHELL
 	imply SHELL
+	imply OPENTHREAD_SHELL if NET_L2_OPENTHREAD
 
 if NET_L2_OPENTHREAD
 
diff --git a/data_model/1.6/clusters/ACL-Cluster.xml b/data_model/1.6/clusters/ACL-Cluster.xml
new file mode 100644
index 00000000000..8ec0876b756
--- /dev/null
+++ b/data_model/1.6/clusters/ACL-Cluster.xml
@@ -0,0 +1,452 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Managed Device feature, Extension feature, fixed conformance"/>
+    <revision revision="3" summary="Added Auxiliary feature and AuxiliaryACL attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x001F" name="Access Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
+  <features>
+    <feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="MNGD" name="ManagedDevice" summary="Device is managed">
+      <describedConform/>
+    </feature>
+    <feature bit="2" code="AUX" name="Auxiliary" summary="Some auxiliary ACL entries may be auto-generated by other features">
+      <otherwiseConform>
+        <provisionalConform/>
+        <describedConform/>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AccessControlAuxiliaryTypeEnum">
+      <item value="0" name="System" summary="This ACL entry exists because of some system reason and is likely non-revocable">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Groupcast" summary="Synthesized via Groupcast Cluster administrator-configured group membership">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="AccessControlEntryAuthModeEnum">
+      <item value="1" name="PASE" summary="Passcode authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CASE" summary="Certificate authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Group" summary="Group authenticated session">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="AccessControlEntryPrivilegeEnum">
+      <item value="1" name="View" summary="Can read and observe all (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ProxyView">
+        <deprecateConform/>
+      </item>
+      <item value="3" name="Operate" summary="View privileges, and can perform the primary function of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Manage" summary="Operate privileges, and can modify persistent configuration of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Administer" summary="Manage privileges, and can observe and modify the Access Control Cluster">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="AccessRestrictionTypeEnum">
+      <item value="0" name="AttributeAccessForbidden" summary="Clients on this fabric are currently forbidden from reading and writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AttributeWriteForbidden" summary="Clients on this fabric are currently forbidden from writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CommandForbidden" summary="Clients on this fabric are currently forbidden from invoking a command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EventForbidden" summary="Clients on this fabric are currently forbidden from reading an event">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ChangeTypeEnum">
+      <item value="0" name="Changed" summary="Entry or extension was changed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Added" summary="Entry or extension was added">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Removed" summary="Entry or extension was removed">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="AccessControlEntryStruct">
+      <field id="1" name="Privilege" type="AccessControlEntryPrivilegeEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="AuthMode" type="AccessControlEntryAuthModeEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Subjects" type="list">
+        <entry type="subject-id"/>
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount>
+            <attribute name="SubjectsPerAccessControlEntry"/>
+          </maxCount>
+        </constraint>
+      </field>
+      <field id="4" name="Targets" type="list">
+        <entry type="AccessControlTargetStruct"/>
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount>
+            <attribute name="TargetsPerAccessControlEntry"/>
+          </maxCount>
+        </constraint>
+      </field>
+      <field id="5" name="AuxiliaryType" type="AccessControlAuxiliaryTypeEnum">
+        <access fabricSensitive="true"/>
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="AccessControlExtensionStruct">
+      <field id="1" name="Data" type="octstr">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="AccessControlTargetStruct">
+      <field id="0" name="Cluster" type="cluster-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DeviceType" type="devtype-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="AccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list">
+        <entry type="AccessRestrictionStruct"/>
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="AccessRestrictionStruct">
+      <field id="0" name="Type" type="AccessRestrictionTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="CommissioningAccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list">
+        <entry type="AccessRestrictionStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ACL" type="list">
+      <entry type="AccessControlEntryStruct"/>
+      <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="Extension" type="list">
+      <entry type="AccessControlExtensionStruct"/>
+      <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="4"/>
+          <to value="65534"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="3"/>
+          <to value="65534"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="4"/>
+          <to value="65534"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="CommissioningARL" type="list">
+      <entry type="CommissioningAccessRestrictionEntryStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="ARL" type="list">
+      <entry type="AccessRestrictionEntryStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="AuxiliaryACL" type="list">
+      <entry type="AccessControlEntryStruct"/>
+      <access read="true" readPrivilege="admin" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="AUX"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <maxCount value="2000"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ReviewFabricRestrictions" direction="commandToServer" response="ReviewFabricRestrictionsResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="ARL" type="list">
+        <entry type="CommissioningAccessRestrictionEntryStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ReviewFabricRestrictionsResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="AccessControlEntryChanged" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="1" name="AdminNodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="AdminPasscodeID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="ChangeType" type="ChangeTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="LatestValue" type="AccessControlEntryStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="AccessControlExtensionChanged" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
+      <field id="1" name="AdminNodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="AdminPasscodeID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="ChangeType" type="ChangeTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="LatestValue" type="AccessControlExtensionStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="FabricRestrictionReviewUpdate" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Instruction" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+      <field id="2" name="ARLRequestFlowUrl" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="AuxiliaryAccessUpdated" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="AUX"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="AdminNodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/AccountLogin.xml b/data_model/1.6/clusters/AccountLogin.xml
new file mode 100644
index 00000000000..30d19b20517
--- /dev/null
+++ b/data_model/1.6/clusters/AccountLogin.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add support for 8 character Passcode in GetSetupPIN and Login, Add Node to Login, Logout commands. Add LoggedOut event."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050E" name="Account Login"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="16"/>
+            <to value="100"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
+      <access fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="SetupPIN" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="Login" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="16"/>
+            <to value="100"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="SetupPIN" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <minLength value="8"/>
+        </constraint>
+      </field>
+      <field id="2" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x03" name="Logout" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="LoggedOut" priority="critical">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <optionalConform/>
+      <field id="0" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ActionsCluster.xml b/data_model/1.6/clusters/ActionsCluster.xml
new file mode 100644
index 00000000000..d60bcd1e2d9
--- /dev/null
+++ b/data_model/1.6/clusters/ActionsCluster.xml
@@ -0,0 +1,413 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0025" name="Actions Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0025" name="Actions"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="ACT" scope="Node"/>
+  <dataTypes>
+    <enum name="ActionErrorEnum">
+      <item value="0" name="Unknown" summary="Other reason not listed in the row(s) below">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Interrupted" summary="The action was interrupted by another command or interaction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ActionStateEnum">
+      <item value="0" name="Inactive" summary="The action is not active">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Active" summary="The action is active">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Paused" summary="The action has been paused">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Disabled" summary="The action has been disabled">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ActionTypeEnum">
+      <item value="0" name="Other" summary="Use this only when none of the other values applies">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Scene" summary="Bring the endpoints into a certain state">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Sequence" summary="A sequence of states with a certain time pattern">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Automation" summary="Control an automation (e.g. motion sensor controlling lights)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Exception" summary="Sequence that will run when something doesn&apos;t happen">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Notification" summary="Use the endpoints to send a message to user">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Alarm" summary="Higher priority notification">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EndpointListTypeEnum">
+      <item value="0" name="Other" summary="Another group of endpoints">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Room" summary="User-configured group of endpoints where an endpoint can be in only one room">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Zone" summary="User-configured group of endpoints where an endpoint can be in any number of zones">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="CommandBits">
+      <bitfield name="InstantAction" bit="0" summary="Indicate support for InstantAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="InstantActionWithTransition" bit="1" summary="Indicate support for InstantActionWithTransition command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StartAction" bit="2" summary="Indicate support for StartAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StartActionWithDuration" bit="3" summary="Indicate support for StartActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StopAction" bit="4" summary="Indicate support for StopAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PauseAction" bit="5" summary="Indicate support for PauseAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PauseActionWithDuration" bit="6" summary="Indicate support for PauseActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResumeAction" bit="7" summary="Indicate support for ResumeAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="EnableAction" bit="8" summary="Indicate support for EnableAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="EnableActionWithDuration" bit="9" summary="Indicate support for EnableActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DisableAction" bit="10" summary="Indicate support for DisableAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DisableActionWithDuration" bit="11" summary="Indicate support for DisableActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="ActionStruct">
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+        <constraint>
+          <maxCodePoints value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="Type" type="ActionTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EndpointListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SupportedCommands" type="CommandBits">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="0x0FFF"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="State" type="ActionStateEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="EndpointListStruct">
+      <field id="0" name="EndpointListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+        <constraint>
+          <maxCodePoints value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="Type" type="EndpointListTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="256"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ActionList" type="list" default="empty">
+      <entry type="ActionStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="256"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="EndpointLists" type="list" default="empty">
+      <entry type="EndpointListStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="256"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="SetupURL" type="string" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="512"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="InstantAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="InstantActionWithTransition" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="StartAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x03" name="StartActionWithDuration" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StopAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="PauseAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x06" name="PauseActionWithDuration" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="ResumeAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x08" name="EnableAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x09" name="EnableActionWithDuration" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0A" name="DisableAction" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x0B" name="DisableActionWithDuration" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <describedConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="StateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NewState" type="ActionStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ActionFailed" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NewState" type="ActionStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Error" type="ActionErrorEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/AdminCommissioningCluster.xml b/data_model/1.6/clusters/AdminCommissioningCluster.xml
new file mode 100644
index 00000000000..dc059a4cceb
--- /dev/null
+++ b/data_model/1.6/clusters/AdminCommissioningCluster.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003C" name="Administrator Commissioning Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x003C" name="Administrator Commissioning"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
+  <features>
+    <feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CommissioningWindowStatusEnum">
+      <item value="0" name="WindowNotOpen" summary="Commissioning window not open">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="EnhancedWindowOpen" summary="An Enhanced Commissioning Method window is open">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BasicWindowOpen" summary="A Basic Commissioning Method window is open">
+        <mandatoryConform>
+          <feature name="BC"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="Busy" summary="Could not be completed because another commissioning is in progress">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="PAKEParameterError" summary="Provided PAKE parameters were incorrectly formatted or otherwise invalid">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="WindowNotOpen" summary="No commissioning window was currently open">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="WindowStatus" type="CommissioningWindowStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="AdminVendorId" type="vendor-id">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="PAKEPasscodeVerifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="97"/>
+        </constraint>
+      </field>
+      <field id="2" name="Discriminator" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="4095"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="Iterations" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1000"/>
+            <to value="100000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="Salt" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="16"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="BC"/>
+      </mandatoryConform>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/AirQuality.xml b/data_model/1.6/clusters/AirQuality.xml
new file mode 100644
index 00000000000..1146fff31a5
--- /dev/null
+++ b/data_model/1.6/clusters/AirQuality.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005B" name="Air Quality"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="AIRQUAL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="MOD" name="Moderate" summary="Cluster supports the Moderate air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="VPOOR" name="VeryPoor" summary="Cluster supports the Very poor air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="XPOOR" name="ExtremelyPoor" summary="Cluster supports the Extremely poor air quality level">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AirQualityEnum">
+      <item value="0" name="Unknown" summary="The air quality is unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Good" summary="The air quality is good.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Fair" summary="The air quality is fair.">
+        <mandatoryConform>
+          <feature name="FAIR"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Moderate" summary="The air quality is moderate.">
+        <mandatoryConform>
+          <feature name="MOD"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="Poor" summary="The air quality is poor.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="VeryPoor" summary="The air quality is very poor.">
+        <mandatoryConform>
+          <feature name="VPOOR"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="ExtremelyPoor" summary="The air quality is extremely poor.">
+        <mandatoryConform>
+          <feature name="XPOOR"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AirQuality" type="AirQualityEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/AlarmBase.xml b/data_model/1.6/clusters/AlarmBase.xml
new file mode 100644
index 00000000000..a8ac0426a74
--- /dev/null
+++ b/data_model/1.6/clusters/AlarmBase.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Alarm Base Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Changed event field ID&apos;s to match SDK"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId name="Alarm Base"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="ALARM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="AlarmBitmap"/>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Mask" type="AlarmBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Latch" type="AlarmBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RESET"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="State" type="AlarmBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="Supported" type="AlarmBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Reset" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RESET"/>
+      </mandatoryConform>
+      <field id="0" name="Alarms" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ModifyEnabledAlarms" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="Mask" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="Notify" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="Active" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Inactive" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="State" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Mask" type="AlarmBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ApplicationBasic.xml b/data_model/1.6/clusters/ApplicationBasic.xml
new file mode 100644
index 00000000000..8ea20956843
--- /dev/null
+++ b/data_model/1.6/clusters/ApplicationBasic.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050D" name="Application Basic"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="APBSC" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="ApplicationStatusEnum">
+      <item value="0" name="Stopped" summary="Application is not running.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ActiveVisibleFocus" summary="Application is running, is visible to the user, and is the active target for input.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ActiveHidden" summary="Application is running but not visible to the user.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ActiveVisibleNotFocus" summary="Application is running and visible, but is not the active target for input.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ApplicationStruct">
+      <field id="0" name="CatalogVendorID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ApplicationID" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="VendorName" type="string" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="VendorID" type="vendor-id">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="ApplicationName" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="256"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="ProductID" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="Application" type="ApplicationStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="Status" type="ApplicationStatusEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="ApplicationVersion" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="AllowedVendorList" type="list">
+      <entry type="vendor-id"/>
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ApplicationLauncher.xml b/data_model/1.6/clusters/ApplicationLauncher.xml
new file mode 100644
index 00000000000..82450d0e4cc
--- /dev/null
+++ b/data_model/1.6/clusters/ApplicationLauncher.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Addition of new states to StatusEnum"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050C" name="Application Launcher"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="APPLAUNCHER" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="AP" name="ApplicationPlatform" summary="Support for attributes and commands required for endpoint to support launching any application within the supported application catalogs">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AppNotAvailable" summary="Requested app is not available">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SystemBusy" summary="Video platform unable to honor command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PendingUserApproval" summary="User approval for app download is pending">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Downloading" summary="Downloading the requested app">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Installing" summary="Installing the requested app">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ApplicationEPStruct">
+      <field id="0" name="Application" type="ApplicationStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="ApplicationStruct">
+      <field id="0" name="CatalogVendorID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ApplicationID" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CatalogList" type="list">
+      <entry type="uint16"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="AP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="CurrentApp" type="ApplicationEPStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="LaunchApp" direction="commandToServer" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Data" type="octstr" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="StopApp" direction="commandToServer" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct" default="MS">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="HideApp" direction="commandToServer" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct" default="MS">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="LauncherResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="octstr" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/AudioOutput.xml b/data_model/1.6/clusters/AudioOutput.xml
new file mode 100644
index 00000000000..4d2b2e7f68d
--- /dev/null
+++ b/data_model/1.6/clusters/AudioOutput.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050B" name="Audio Output Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050B" name="Audio Output"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="AUDIOOUTPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to output names">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="OutputTypeEnum">
+      <item value="0" name="HDMI" summary="HDMI">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BT">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Optical">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Headphone">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Internal">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Other">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="OutputInfoStruct">
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OutputType" type="OutputTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OutputList" type="list">
+      <entry type="OutputInfoStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentOutput" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelectOutput" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="RenameOutput" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="NU"/>
+      </mandatoryConform>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/BasicInformationCluster.xml b/data_model/1.6/clusters/BasicInformationCluster.xml
new file mode 100644
index 00000000000..cee3b216466
--- /dev/null
+++ b/data_model/1.6/clusters/BasicInformationCluster.xml
@@ -0,0 +1,492 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0028" name="Basic Information Cluster" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added ProductAppearance attribute"/>
+    <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory"/>
+    <revision revision="5" summary="Added ConfigurationVersion attribute"/>
+    <revision revision="6"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0028" name="Basic Information"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="BINFO" scope="Node"/>
+  <dataTypes>
+    <enum name="ColorEnum">
+      <item value="0" name="Black" summary="Approximately RGB #000000.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Navy" summary="Approximately RGB #000080.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Green" summary="Approximately RGB #008000.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Teal" summary="Approximately RGB #008080.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Maroon" summary="Approximately RGB #800000.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Purple" summary="Approximately RGB #800080.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Olive" summary="Approximately RGB #808000.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Gray" summary="Approximately RGB #808080.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Blue" summary="Approximately RGB #0000FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Lime" summary="Approximately RGB #00FF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Aqua" summary="Approximately RGB #00FFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Red" summary="Approximately RGB #FF0000.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Fuchsia" summary="Approximately RGB #FF00FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Yellow" summary="Approximately RGB #FFFF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="White" summary="Approximately RGB #FFFFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="Nickel" summary="Typical hardware &quot;Nickel&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="Chrome" summary="Typical hardware &quot;Chrome&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="Brass" summary="Typical hardware &quot;Brass&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="Copper" summary="Typical hardware &quot;Copper&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="Silver" summary="Typical hardware &quot;Silver&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="Gold" summary="Typical hardware &quot;Gold&quot; color.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ProductFinishEnum">
+      <item value="0" name="Other" summary="Product has some other finish not listed below.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Matte" summary="Product has a matte finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Satin" summary="Product has a satin finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Polished" summary="Product has a polished or shiny finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rugged" summary="Product has a rugged finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Fabric" summary="Product has a fabric finish.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="CapabilityMinimaStruct">
+      <field id="0" name="CaseSessionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="SubscriptionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="SimultaneousInvocationsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="SimultaneousWritesSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="ReadPathsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="9"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="SubscribePathsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProductAppearanceStruct">
+      <field id="0" name="Finish" type="ProductFinishEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PrimaryColor" type="ColorEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DataModelRevision" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="VendorName" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="VendorID" type="vendor-id" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="ProductName" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="ProductID" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="NodeLabel" type="string" default="&quot;&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="Location" type="string" default="&quot;XX&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="2"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="HardwareVersion" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="HardwareVersionString" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="64"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="SoftwareVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="SoftwareVersionString" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="64"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="ManufacturingDate" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="8"/>
+          <to value="16"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="PartNumber" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000D" name="ProductURL" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="256"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="ProductLabel" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="SerialNumber" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="LocalConfigDisabled" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0011" name="Reachable" type="bool" default="true">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0012" name="UniqueID" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="4"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="CapabilityMinima" type="CapabilityMinimaStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0014" name="ProductAppearance" type="ProductAppearanceStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="2"/>
+        </greaterOrEqualTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0015" name="SpecificationVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="3"/>
+        </greaterOrEqualTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="MaxPathsPerInvoke" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="3"/>
+        </greaterOrEqualTerm>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0018" name="ConfigurationVersion" type="uint32" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="5"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="StartUp" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ShutDown" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="Leave" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="ReachableChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <attribute name="Reachable"/>
+      </mandatoryConform>
+      <field id="0" name="ReachableNewValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/Binding-Cluster.xml b/data_model/1.6/clusters/Binding-Cluster.xml
new file mode 100644
index 00000000000..81e96e25bb3
--- /dev/null
+++ b/data_model/1.6/clusters/Binding-Cluster.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001E" name="Binding Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x001E" name="Binding"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="BIND" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="TargetStruct">
+      <field id="1" name="Node" type="node-id">
+        <mandatoryConform>
+          <field name="Endpoint"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Group" type="group-id">
+        <mandatoryConform>
+          <notTerm>
+            <field name="Endpoint"/>
+          </notTerm>
+        </mandatoryConform>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="Endpoint" type="endpoint-no">
+        <mandatoryConform>
+          <notTerm>
+            <field name="Group"/>
+          </notTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="Cluster" type="cluster-id">
+        <optionalConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Binding" type="list" default="empty">
+      <entry type="TargetStruct"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/BooleanState.xml b/data_model/1.6/clusters/BooleanState.xml
new file mode 100644
index 00000000000..ed2e8933a20
--- /dev/null
+++ b/data_model/1.6/clusters/BooleanState.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0045" name="Boolean State Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Removed P quality"/>
+    <revision revision="3" summary="Introduced ChangeEvent feature"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0045" name="Boolean State"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="BOOL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CHGEVENT" name="ChangeEvent" summary="Supports reporting change events">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="3"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="StateValue" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="StateChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="CHGEVENT"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="StateValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/BooleanStateConfiguration.xml b/data_model/1.6/clusters/BooleanStateConfiguration.xml
new file mode 100644
index 00000000000..dc035c6b87b
--- /dev/null
+++ b/data_model/1.6/clusters/BooleanStateConfiguration.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0080" name="Boolean State Configuration Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added FaultEvents feature"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0080" name="Boolean State Configuration"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="BOOLCFG" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="VIS" name="Visual" summary="Supports visual alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="AUD" name="Audible" summary="Supports audible alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="SPRS" name="AlarmSuppress" summary="Supports ability to suppress or acknowledge alarms">
+      <optionalConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="SENSLVL" name="SensitivityLevel" summary="Supports ability to set sensor sensitivity">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="FAULTEV" name="FaultEvents" summary="Supports reporting fault events">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="AlarmModeBitmap">
+      <bitfield name="Visual" bit="0" summary="Visual alarming">
+        <mandatoryConform>
+          <feature name="VIS"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Audible" bit="1" summary="Audible alarming">
+        <mandatoryConform>
+          <feature name="AUD"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="SensorFaultBitmap">
+      <bitfield name="GeneralFault" bit="0" summary="Unspecified fault detected">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="SENSLVL"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <attribute name="SupportedSensitivityLevels"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SENSLVL"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="2"/>
+          <to value="10"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="SENSLVL"/>
+      </optionalConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <attribute name="SupportedSensitivityLevels"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SPRS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="SensorFault" type="SensorFaultBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SuppressAlarm" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SPRS"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmsToSuppress" type="AlarmModeBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="EnableDisableAlarm" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="AlarmsToEnableDisable" type="AlarmModeBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="AlarmsStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="AlarmsActive" type="AlarmModeBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="AlarmsSuppressed" type="AlarmModeBitmap">
+        <mandatoryConform>
+          <feature name="SPRS"/>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x01" name="SensorFault" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="FAULTEV"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="SensorFault" type="SensorFaultBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/BridgedDeviceBasicInformationCluster.xml b/data_model/1.6/clusters/BridgedDeviceBasicInformationCluster.xml
new file mode 100644
index 00000000000..6464fb90566
--- /dev/null
+++ b/data_model/1.6/clusters/BridgedDeviceBasicInformationCluster.xml
@@ -0,0 +1,522 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0039" name="Bridged Device Basic Information Cluster" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added ProductAppearance attribute"/>
+    <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory, ProductID to optional when bridging Matter devices, add the BridgedICDSupport feature"/>
+    <revision revision="5" summary="Added ConfigurationVersion attribute"/>
+    <revision revision="6"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0039" name="Bridged Device Basic Information"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Basic Information" role="utility" picsCode="BRBINFO" scope="Endpoint"/>
+  <features>
+    <feature bit="20" code="BIS" name="BridgedICDSupport" summary="Support bridged ICDs.">
+      <optionalConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="4"/>
+        </greaterOrEqualTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ColorEnum">
+      <item value="0" name="Black" summary="Approximately RGB #000000.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Navy" summary="Approximately RGB #000080.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Green" summary="Approximately RGB #008000.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Teal" summary="Approximately RGB #008080.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Maroon" summary="Approximately RGB #800000.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Purple" summary="Approximately RGB #800080.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Olive" summary="Approximately RGB #808000.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Gray" summary="Approximately RGB #808080.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Blue" summary="Approximately RGB #0000FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Lime" summary="Approximately RGB #00FF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Aqua" summary="Approximately RGB #00FFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Red" summary="Approximately RGB #FF0000.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Fuchsia" summary="Approximately RGB #FF00FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Yellow" summary="Approximately RGB #FFFF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="White" summary="Approximately RGB #FFFFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="Nickel" summary="Typical hardware &quot;Nickel&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="Chrome" summary="Typical hardware &quot;Chrome&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="Brass" summary="Typical hardware &quot;Brass&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="Copper" summary="Typical hardware &quot;Copper&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="Silver" summary="Typical hardware &quot;Silver&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="Gold" summary="Typical hardware &quot;Gold&quot; color.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ProductFinishEnum">
+      <item value="0" name="Other" summary="Product has some other finish not listed below.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Matte" summary="Product has a matte finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Satin" summary="Product has a satin finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Polished" summary="Product has a polished or shiny finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rugged" summary="Product has a rugged finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Fabric" summary="Product has a fabric finish.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="CapabilityMinimaStruct">
+      <field id="0" name="CaseSessionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="SubscriptionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="SimultaneousInvocationsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="SimultaneousWritesSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="ReadPathsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="9"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="SubscribePathsSupported" type="uint16">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="6"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="3"/>
+            <to value="10000"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProductAppearanceStruct">
+      <field id="0" name="Finish" type="ProductFinishEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PrimaryColor" type="ColorEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DataModelRevision" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <disallowConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="VendorName" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <describedConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="VendorID" type="vendor-id" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <describedConform/>
+    </attribute>
+    <attribute id="0x0003" name="ProductName" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="ProductID" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <describedConform/>
+    </attribute>
+    <attribute id="0x0005" name="NodeLabel" type="string" default="&quot;&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="Location" type="string" default="&quot;XX&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <disallowConform/>
+      <constraint>
+        <allowed value="2"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="HardwareVersion" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0008" name="HardwareVersionString" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="64"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="SoftwareVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="SoftwareVersionString" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="64"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="ManufacturingDate" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="8"/>
+          <to value="16"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="PartNumber" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000D" name="ProductURL" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="256"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="ProductLabel" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="SerialNumber" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="LocalConfigDisabled" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0011" name="Reachable" type="bool" default="true">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0012" name="UniqueID" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="4"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="CapabilityMinima" type="CapabilityMinimaStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0014" name="ProductAppearance" type="ProductAppearanceStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="2"/>
+        </greaterOrEqualTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0015" name="SpecificationVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <disallowConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="MaxPathsPerInvoke" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <disallowConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0018" name="ConfigurationVersion" type="uint32" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="5"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x80" name="KeepActive" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="BIS"/>
+      </mandatoryConform>
+      <field id="0" name="StayActiveDuration" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="TimeoutMs" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="30000"/>
+            <to value="3600000"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="StartUp" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ShutDown" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="Leave" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <disallowConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="ReachableChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ReachableNewValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x80" name="ActiveChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BIS"/>
+      </mandatoryConform>
+      <field id="0" name="PromisedActiveDuration" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/CameraAVSettingsUserLevelManagement.xml b/data_model/1.6/clusters/CameraAVSettingsUserLevelManagement.xml
new file mode 100644
index 00000000000..70c42a322c4
--- /dev/null
+++ b/data_model/1.6/clusters/CameraAVSettingsUserLevelManagement.xml
@@ -0,0 +1,552 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0552" name="Camera AV Settings User Level Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0552" name="Camera AV Settings User Level Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="AVSUM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DPTZ" name="DigitalPTZ" summary="Digital PTZ support">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="MPAN" name="MechanicalPan" summary="Mechanical Pan support">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="MTILT" name="MechanicalTilt" summary="Mechanical Tilt support">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="MZOOM" name="MechanicalZoom" summary="Mechanical Zoom support">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="4" code="MPRESETS" name="MechanicalPresets" summary="Mechanical saved presets support">
+      <optionalConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PhysicalMovementEnum">
+      <item value="0" name="Idle" summary="The camera is idle.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Moving" summary="The camera is moving to a new value of Pan, Tilt, and/or Zoom.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="DPTZStruct">
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Viewport" type="ViewportStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="MPTZPresetStruct">
+      <field id="0" name="PresetID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxPresets"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="Settings" type="MPTZStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="MPTZStruct">
+      <field id="0" name="Pan" type="int16">
+        <mandatoryConform>
+          <feature name="MPAN"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from>
+              <attribute name="PanMin"/>
+            </from>
+            <to>
+              <attribute name="PanMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Tilt" type="int16">
+        <mandatoryConform>
+          <feature name="MTILT"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from>
+              <attribute name="TiltMin"/>
+            </from>
+            <to>
+              <attribute name="TiltMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Zoom" type="uint8">
+        <mandatoryConform>
+          <feature name="MZOOM"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="ZoomMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MPTZPosition" type="MPTZStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="MaxPresets" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="MPTZPresets" type="list">
+      <entry type="MPTZPresetStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount>
+          <attribute name="MaxPresets"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="DPTZStreams" type="list">
+      <entry type="DPTZStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="DPTZ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="ZoomMax" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MZOOM"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="2"/>
+          <to value="100"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="TiltMin" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MTILT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="-180"/>
+          <to value="0"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="TiltMax" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MTILT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="180"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="PanMin" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MPAN"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="-180"/>
+          <to value="0"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="PanMax" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MPAN"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="180"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="MovementState" type="PhysicalMovementEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="MPTZSetPosition" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Pan" type="int16">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="MPAN"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <attribute name="PanMin"/>
+            </from>
+            <to>
+              <attribute name="PanMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Tilt" type="int16">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="MTILT"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <attribute name="TiltMin"/>
+            </from>
+            <to>
+              <attribute name="TiltMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Zoom" type="uint8">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="MZOOM"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="ZoomMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="MPTZRelativeMove" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="PanDelta" type="int16" default="0">
+        <optionalConform choice="c" more="true" min="1">
+          <feature name="MPAN"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <compute>
+                <operation>multiply</operation>
+                <left value="-1"/>
+                <right>
+                  <compute>
+                    <operation>subtract</operation>
+                    <left>
+                      <attribute name="PanMax"/>
+                    </left>
+                    <right>
+                      <attribute name="PanMin"/>
+                    </right>
+                  </compute>
+                </right>
+              </compute>
+            </from>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="PanMax"/>
+                </left>
+                <right>
+                  <attribute name="PanMin"/>
+                </right>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="TiltDelta" type="int16" default="0">
+        <optionalConform choice="c" more="true" min="1">
+          <feature name="MTILT"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <compute>
+                <operation>multiply</operation>
+                <left value="-1"/>
+                <right>
+                  <compute>
+                    <operation>subtract</operation>
+                    <left>
+                      <attribute name="TiltMax"/>
+                    </left>
+                    <right>
+                      <attribute name="TiltMin"/>
+                    </right>
+                  </compute>
+                </right>
+              </compute>
+            </from>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="TiltMax"/>
+                </left>
+                <right>
+                  <attribute name="TiltMin"/>
+                </right>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="ZoomDelta" type="int8" default="0">
+        <optionalConform choice="c" more="true" min="1">
+          <feature name="MZOOM"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <compute>
+                <operation>multiply</operation>
+                <left value="-1"/>
+                <right>
+                  <compute>
+                    <operation>subtract</operation>
+                    <left>
+                      <attribute name="ZoomMax"/>
+                    </left>
+                    <right value="1"/>
+                  </compute>
+                </right>
+              </compute>
+            </from>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="ZoomMax"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="MPTZMoveToPreset" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+      <field id="0" name="PresetID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxPresets"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="MPTZSavePreset" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+      <field id="0" name="PresetID" type="uint8">
+        <optionalConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxPresets"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="MPTZRemovePreset" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+      <field id="0" name="PresetID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxPresets"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="DPTZSetViewport" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="DPTZ"/>
+      </mandatoryConform>
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Viewport" type="ViewportStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="DPTZRelativeMove" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="DPTZ"/>
+      </optionalConform>
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DeltaX" type="int16" default="0">
+        <optionalConform choice="d" more="true" min="1"/>
+      </field>
+      <field id="2" name="DeltaY" type="int16" default="0">
+        <optionalConform choice="d" more="true" min="1"/>
+      </field>
+      <field id="3" name="ZoomDelta" type="int8" default="0">
+        <optionalConform choice="d" more="true" min="1"/>
+        <constraint>
+          <between>
+            <from value="-100"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/CameraAVStreamManagement.xml b/data_model/1.6/clusters/CameraAVStreamManagement.xml
new file mode 100644
index 00000000000..1b2f249d4b0
--- /dev/null
+++ b/data_model/1.6/clusters/CameraAVStreamManagement.xml
@@ -0,0 +1,1164 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0551" name="Camera AV Stream Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0551" name="Camera AV Stream Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="AVSM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="ADO" name="Audio" summary="Audio Streams supported">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="VDO" name="Video" summary="Video Streams supported">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="SNP" name="Snapshot" summary="Snapshot Streams supported">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="PRIV" name="Privacy" summary="Privacy supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="SPKR" name="Speaker" summary="Speaker supported">
+      <optionalConform>
+        <feature name="ADO"/>
+      </optionalConform>
+    </feature>
+    <feature bit="5" code="ICTL" name="ImageControl" summary="Image control supported">
+      <optionalConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="6" code="WMARK" name="Watermark" summary="Watermark supported">
+      <optionalConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="7" code="OSD" name="OnScreenDisplay" summary="OSD supported">
+      <optionalConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="8" code="STOR" name="LocalStorage" summary="Local Storage available">
+      <optionalConform/>
+    </feature>
+    <feature bit="9" code="HDR" name="HighDynamicRange" summary="High Dynamic Range supported">
+      <optionalConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="10" code="NV" name="NightVision" summary="Night Vision mode supported">
+      <optionalConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="AudioStreamID" type="uint16"/>
+    <number name="SnapshotStreamID" type="uint16"/>
+    <number name="VideoStreamID" type="uint16"/>
+    <enum name="AudioCodecEnum">
+      <item value="0" name="OPUS" summary="Open source IETF standard codec.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AAC-LC" summary="Advanced Audio Coding codec-Low Complexity">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ImageCodecEnum">
+      <item value="0" name="JPEG" summary="JPEG image codec.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="HEIC" summary="HEIC image codec.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="TriStateAutoEnum">
+      <item value="0" name="Off" summary="Off">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="On" summary="On">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Auto" summary="Automatic Operation">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TwoWayTalkSupportTypeEnum">
+      <item value="0" name="NotSupported" summary="Two-way Talk support is absent.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="HalfDuplex" summary="Audio in one direction at a time.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="FullDuplex" summary="Audio in both directions simultaneously.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="VideoCodecEnum">
+      <item value="0" name="H264" summary="Advanced Video Coding (H.264) codec.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="HEVC" summary="High efficiency Video Coding (H.265) codec.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="VVC" summary="Versatile Video Coding (H.266) codec.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="AV1" summary="AOMedia Video 1 codec.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <struct name="AVMetadataStruct">
+      <field id="1" name="UTCTime" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MotionZonesActive" type="list">
+        <entry type="ZoneID"/>
+        <optionalConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="BlackAndWhiteActive" type="bool">
+        <optionalConform/>
+      </field>
+      <field id="4" name="UserDefined" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="AudioCapabilitiesStruct">
+      <field id="0" name="MaxNumberOfChannels" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="SupportedCodecs" type="list">
+        <entry type="AudioCodecEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+      <field id="2" name="SupportedSampleRates" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="SupportedBitDepths" type="list">
+        <entry type="uint8"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="AudioStreamStruct">
+      <field id="0" name="AudioStreamID" type="AudioStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="AudioCodec" type="AudioCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="ChannelCount" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="SampleRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="5" name="BitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="6" name="BitDepth" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+        <constraint>
+          <allowed value="24"/>
+        </constraint>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+      <field id="7" name="ReferenceCount" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="RateDistortionTradeOffPointsStruct">
+      <field id="0" name="Codec" type="VideoCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Resolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinBitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SnapshotCapabilitiesStruct">
+      <field id="0" name="Resolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="2" name="ImageCodec" type="ImageCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="RequiresEncodedPixels" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="RequiresHardwareEncoder" type="bool">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="RequiresEncodedPixels"/>
+            <literal value="true"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="SnapshotStreamStruct">
+      <field id="0" name="SnapshotStreamID" type="SnapshotStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ImageCodec" type="ImageCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="MinResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="MaxResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Quality" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="6" name="ReferenceCount" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="EncodedPixels" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="HardwareEncoder" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="WatermarkEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="WMARK"/>
+        </mandatoryConform>
+      </field>
+      <field id="10" name="OSDEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="OSD"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="VideoResolutionStruct">
+      <field id="0" name="Width" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="Height" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="VideoSensorParamsStruct">
+      <field id="0" name="SensorWidth" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="64"/>
+        </constraint>
+      </field>
+      <field id="1" name="SensorHeight" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="64"/>
+        </constraint>
+      </field>
+      <field id="2" name="MaxFPS" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="MaxHDRFPS" type="uint16">
+        <mandatoryConform>
+          <feature name="HDR"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <field name="MaxFPS"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="VideoStreamStruct">
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="VideoCodec" type="VideoCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="MinFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <field name="MaxFrameRate"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="MaxFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="5" name="MinResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="MaxResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="MinBitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <field name="MaxBitRate"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="8" name="MaxBitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="9" name="KeyFrameInterval" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65500"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="10" name="WatermarkEnabled" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="WMARK"/>
+        </mandatoryConform>
+      </field>
+      <field id="11" name="OSDEnabled" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="OSD"/>
+        </mandatoryConform>
+      </field>
+      <field id="12" name="ReferenceCount" type="uint8" default="0">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxConcurrentEncoders" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="MaxEncodedPixelRate" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VDO"/>
+          <feature name="SNP"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="VideoSensorParams" type="VideoSensorParamsStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="NightVisionUsesInfrared" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="NV"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="MinViewportResolution" type="VideoResolutionStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="RateDistortionTradeOffPoints" type="list">
+      <entry type="RateDistortionTradeOffPointsStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="MaxContentBufferSize" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0007" name="MicrophoneCapabilities" type="AudioCapabilitiesStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="SpeakerCapabilities" type="AudioCapabilitiesStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="TwoWayTalkSupport" type="TwoWayTalkSupportTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="SnapshotCapabilities" type="list">
+      <entry type="SnapshotCapabilitiesStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000B" name="MaxNetworkBandwidth" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000C" name="CurrentFrameRate" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000D" name="HDRModeEnabled" type="bool">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="HDR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000E" name="SupportedStreamUsages" type="list">
+      <entry type="StreamUsageEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000F" name="AllocatedVideoStreams" type="list">
+      <entry type="VideoStreamStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0010" name="AllocatedAudioStreams" type="list">
+      <entry type="AudioStreamStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0011" name="AllocatedSnapshotStreams" type="list">
+      <entry type="SnapshotStreamStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0012" name="StreamUsagePriorities" type="list">
+      <entry type="StreamUsageEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0013" name="SoftRecordingPrivacyModeEnabled" type="bool">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="PRIV"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0014" name="SoftLivestreamPrivacyModeEnabled" type="bool">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="PRIV"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0015" name="HardPrivacyModeOn" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0016" name="NightVision" type="TriStateAutoEnum">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="NV"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0017" name="NightVisionIllum" type="TriStateAutoEnum">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="NV"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0018" name="Viewport" type="ViewportStruct">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0019" name="SpeakerMuted" type="bool">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001A" name="SpeakerVolumeLevel" type="uint8">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="SpeakerMinLevel"/>
+          </from>
+          <to>
+            <attribute name="SpeakerMaxLevel"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x001B" name="SpeakerMaxLevel" type="uint8">
+      <access read="true" readPrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="SpeakerMinLevel"/>
+          </from>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x001C" name="SpeakerMinLevel" type="uint8">
+      <access read="true" readPrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SPKR"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <attribute name="SpeakerMaxLevel"/>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x001D" name="MicrophoneMuted" type="bool">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001E" name="MicrophoneVolumeLevel" type="uint8">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MicrophoneMinLevel"/>
+          </from>
+          <to>
+            <attribute name="MicrophoneMaxLevel"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x001F" name="MicrophoneMaxLevel" type="uint8">
+      <access read="true" readPrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MicrophoneMinLevel"/>
+          </from>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0020" name="MicrophoneMinLevel" type="uint8">
+      <access read="true" readPrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <attribute name="MicrophoneMaxLevel"/>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0021" name="MicrophoneAGCEnabled" type="bool" default="true">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="ADO"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0022" name="ImageRotation" type="uint16">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform choice="b" more="true" min="1">
+        <feature name="ICTL"/>
+      </optionalConform>
+      <constraint>
+        <max value="359"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0023" name="ImageFlipHorizontal" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform choice="b" more="true" min="1">
+        <feature name="ICTL"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0024" name="ImageFlipVertical" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform choice="b" more="true" min="1">
+        <feature name="ICTL"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0025" name="LocalVideoRecordingEnabled" type="bool">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="VDO"/>
+          <feature name="STOR"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0026" name="LocalSnapshotRecordingEnabled" type="bool">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="SNP"/>
+          <feature name="STOR"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0027" name="StatusLightEnabled" type="bool" default="true">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0028" name="StatusLightBrightness" type="ThreeLevelAutoEnum">
+      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AudioStreamAllocate" direction="commandToServer" response="AudioStreamAllocateResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <field id="0" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Recording"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Analysis"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="LiveView"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="1" name="AudioCodec" type="AudioCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ChannelCount" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="SampleRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="4" name="BitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="5" name="BitDepth" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+        <constraint>
+          <allowed value="24"/>
+        </constraint>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="AudioStreamAllocateResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <field id="0" name="AudioStreamID" type="AudioStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="AudioStreamDeallocate" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ADO"/>
+      </mandatoryConform>
+      <field id="0" name="AudioStreamID" type="AudioStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="VideoStreamAllocate" direction="commandToServer" response="VideoStreamAllocateResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+      <field id="0" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Recording"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Analysis"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="LiveView"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="1" name="VideoCodec" type="VideoCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <field name="MaxFrameRate"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="MaxFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="4" name="MinResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MaxResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="MinBitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <field name="MaxBitRate"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="7" name="MaxBitRate" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="8" name="KeyFrameInterval" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65500"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="9" name="WatermarkEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="WMARK"/>
+        </mandatoryConform>
+      </field>
+      <field id="10" name="OSDEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="OSD"/>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x04" name="VideoStreamAllocateResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="VideoStreamModify" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="VDO"/>
+          <orTerm>
+            <feature name="WMARK"/>
+            <feature name="OSD"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="WatermarkEnabled" type="bool">
+        <optionalConform choice="d" more="true" min="1">
+          <feature name="WMARK"/>
+        </optionalConform>
+      </field>
+      <field id="2" name="OSDEnabled" type="bool">
+        <optionalConform choice="d" more="true" min="1">
+          <feature name="OSD"/>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x06" name="VideoStreamDeallocate" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="VDO"/>
+      </mandatoryConform>
+      <field id="0" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="SnapshotStreamAllocate" direction="commandToServer" response="SnapshotStreamAllocateResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+      <field id="0" name="ImageCodec" type="ImageCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxFrameRate" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="2" name="MinResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="MaxResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Quality" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="WatermarkEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="WMARK"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="OSDEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="OSD"/>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x08" name="SnapshotStreamAllocateResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+      <field id="0" name="SnapshotStreamID" type="SnapshotStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x09" name="SnapshotStreamModify" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="SNP"/>
+          <orTerm>
+            <feature name="WMARK"/>
+            <feature name="OSD"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="SnapshotStreamID" type="SnapshotStreamID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="WatermarkEnabled" type="bool">
+        <optionalConform choice="d" more="true" min="1">
+          <feature name="WMARK"/>
+        </optionalConform>
+      </field>
+      <field id="2" name="OSDEnabled" type="bool">
+        <optionalConform choice="d" more="true" min="1">
+          <feature name="OSD"/>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x0A" name="SnapshotStreamDeallocate" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+      <field id="0" name="SnapshotStreamID" type="SnapshotStreamID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0B" name="SetStreamPriorities" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="StreamPriorities" type="list">
+        <entry type="StreamUsageEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="CaptureSnapshot" direction="commandToServer" response="CaptureSnapshotResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+      <field id="0" name="SnapshotStreamID" type="SnapshotStreamID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RequestedResolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0D" name="CaptureSnapshotResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform>
+        <feature name="SNP"/>
+      </mandatoryConform>
+      <field id="0" name="Data" type="octstr">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ImageCodec" type="ImageCodecEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Resolution" type="VideoResolutionStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Channel.xml b/data_model/1.6/clusters/Channel.xml
new file mode 100644
index 00000000000..d51713fc67d
--- /dev/null
+++ b/data_model/1.6/clusters/Channel.xml
@@ -0,0 +1,537 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0504" name="Channel Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add EG and RP features, Identifier and Type to Channel Info for Over-the-Top (OTT) channel support."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0504" name="Channel"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CHANNEL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CL" name="ChannelList" summary="Provides list of available channels.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LI" name="LineupInfo" summary="Provides lineup info, which is a reference to an external source of lineup information.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="EG" name="ElectronicGuide" summary="Provides electronic program guide information.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="RP" name="RecordProgram" summary="Provides ability to record program.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ChannelTypeEnum">
+      <item value="0" name="Satellite" summary="The channel is sourced from a satellite provider.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Cable" summary="The channel is sourced from a cable provider.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Terrestrial" summary="The channel is sourced from a terrestrial provider.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OTT" summary="The channel is sourced from an OTT provider.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LineupInfoTypeEnum">
+      <item value="0" name="MSO" summary="Multi System Operator">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MultipleMatches" summary="More than one equal match for the ChannelInfoStruct passed in.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NoMatches" summary="No matches for the ChannelInfoStruct passed in.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="RecordingFlagBitmap">
+      <bitfield name="Scheduled" bit="0" summary="The program is scheduled for recording.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RecordSeries" bit="1" summary="The program series is scheduled for recording.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Recorded" bit="2" summary="The program is recorded and available to be played.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="ChannelInfoStruct">
+      <field id="0" name="MajorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Name" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="3" name="CallSign" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="4" name="AffiliateCallSign" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="5" name="Identifier" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="6" name="Type" type="ChannelTypeEnum" default="empty">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="ChannelPagingStruct">
+      <field id="0" name="PreviousToken" type="PageTokenStruct" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="1" name="NextToken" type="PageTokenStruct" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="LineupInfoStruct">
+      <field id="0" name="OperatorName" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="LineupName" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="2" name="PostalCode" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="3" name="LineupInfoType" type="LineupInfoTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="PageTokenStruct">
+      <field id="0" name="Limit" type="uint16" default="0">
+        <optionalConform/>
+      </field>
+      <field id="1" name="After" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="2" name="Before" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProgramCastStruct">
+      <field id="0" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="1" name="Role" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProgramCategoryStruct">
+      <field id="0" name="Category" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="1" name="SubCategory" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProgramStruct">
+      <field id="0" name="Identifier" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="1" name="Channel" type="ChannelInfoStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Title" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="5" name="Subtitle" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="6" name="Description" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="7" name="AudioLanguages" type="list" default="empty">
+        <entry type="string">
+          <constraint>
+            <maxLength value="50"/>
+          </constraint>
+        </entry>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="8" name="Ratings" type="list" default="empty">
+        <entry type="string"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="9" name="ThumbnailUrl" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="10" name="PosterArtUrl" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="11" name="DvbiUrl" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="12" name="ReleaseDate" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="30"/>
+        </constraint>
+      </field>
+      <field id="13" name="ParentalGuidanceText" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="14" name="RecordingFlag" type="RecordingFlagBitmap">
+        <mandatoryConform>
+          <feature name="RP"/>
+        </mandatoryConform>
+      </field>
+      <field id="15" name="SeriesInfo" type="SeriesInfoStruct" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="16" name="CategoryList" type="list" default="empty">
+        <entry type="ProgramCategoryStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="17" name="CastList" type="list" default="empty">
+        <entry type="ProgramCastStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="18" name="ExternalIDList" type="list" default="empty">
+        <entry type="AdditionalInfoStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SeriesInfoStruct">
+      <field id="0" name="Season" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="1" name="Episode" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ChannelList" type="list" default="empty">
+      <entry type="ChannelInfoStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="LI"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="CurrentChannel" type="ChannelInfoStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeChannel" direction="commandToServer" response="ChangeChannelResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CL"/>
+          <feature name="LI"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Match" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ChangeChannelResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CL"/>
+          <feature name="LI"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x02" name="ChangeChannelByNumber" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="MajorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="SkipChannel" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Count" type="int16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="GetProgramGuide" direction="commandToServer" response="ProgramGuideResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EG"/>
+      </mandatoryConform>
+      <field id="0" name="StartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ChannelList" type="list" default="empty">
+        <entry type="ChannelInfoStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="3" name="PageToken" type="PageTokenStruct" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="5" name="RecordingFlag" type="RecordingFlagBitmap" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="6" name="ExternalIDList" type="list" default="empty">
+        <entry type="AdditionalInfoStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="7" name="Data" type="octstr" default="MS">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8092"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="ProgramGuideResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="EG"/>
+      </mandatoryConform>
+      <field id="0" name="Paging" type="ChannelPagingStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ProgramList" type="list" default="empty">
+        <entry type="ProgramStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="RecordProgram" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="RP"/>
+          <feature name="EG"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ProgramIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="1" name="ShouldRecordSeries" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ExternalIDList" type="list" default="empty">
+        <entry type="AdditionalInfoStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="3" name="Data" type="octstr" default="MS">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8092"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="CancelRecordProgram" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="RP"/>
+          <feature name="EG"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ProgramIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="255"/>
+        </constraint>
+      </field>
+      <field id="1" name="ShouldRecordSeries" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ExternalIDList" type="list" default="empty">
+        <entry type="AdditionalInfoStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="3" name="Data" type="octstr" default="MS">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8092"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Chime.xml b/data_model/1.6/clusters/Chime.xml
new file mode 100644
index 00000000000..b21e16789d9
--- /dev/null
+++ b/data_model/1.6/clusters/Chime.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0556" name="Chime Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Add ChimeStartedPlaying event, new optional param to PlayChimeSound to play a specific sound, and remove F quality from InstalledChimeSounds"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0556" name="Chime"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CHIME" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="ChimeSoundStruct">
+      <field id="0" name="ChimeID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="48"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="InstalledChimeSounds" type="list">
+      <entry type="ChimeSoundStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="255"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SelectedChime" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="Enabled" type="bool">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="PlayChimeSound" direction="commandToServer" response="N">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="ChimeID" type="uint8">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform>
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+        </otherwiseConform>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ChimeStartedPlaying" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="ChimeID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ClosureControl.xml b/data_model/1.6/clusters/ClosureControl.xml
new file mode 100644
index 00000000000..b7e3bfd50fe
--- /dev/null
+++ b/data_model/1.6/clusters/ClosureControl.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0104" name="Closure Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0104" name="Closure Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CLCTRL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PS" name="Positioning" summary="Supports Positioning with at least Fully Opened (0%) and Fully Closed (100%) discrete positions">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="LT" name="MotionLatching" summary="Supports a latch (securing a position, or a state)">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="IS" name="Instantaneous" summary="Supports the Instantaneous feature">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="SP" name="Speed" summary="Supports Speed motion throttling">
+      <optionalConform>
+        <andTerm>
+          <feature name="PS"/>
+          <notTerm>
+            <feature name="IS"/>
+          </notTerm>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="VT" name="Ventilation" summary="Supports Ventilation discrete state">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="5" code="PD" name="Pedestrian" summary="Supports Pedestrian discrete state">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="6" code="CL" name="Calibration" summary="Supports the Calibration feature">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="7" code="PT" name="Protection" summary="Supports the Protection feature">
+      <optionalConform/>
+    </feature>
+    <feature bit="8" code="MO" name="ManuallyOperable" summary="Supports the manual operation feature">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ClosureErrorEnum">
+      <item value="0" name="PhysicallyBlocked" summary="An obstacle is blocking the closure movement">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BlockedBySensor" summary="The closure is unsafe to move, as determined by a sensor (e.g. photoelectric sensor) before attempting movement">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="TemperatureLimited" summary="A warning raised by the closure that indicates an over-temperature, e.g. due to excessive drive or stall current">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="MaintenanceRequired" summary="Some malfunctions that are not easily recoverable are detected, or urgent servicing is needed">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="InternalInterference" summary="An internal element is prohibiting motion, e.g. an integrated door within a bigger garage door is open and prevents motion">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="CurrentPositionEnum">
+      <item value="0" name="FullyClosed" summary="Fully closed state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="FullyOpened" summary="Fully opened state">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PartiallyOpened" summary="Partially opened state (closure is not fully opened or fully closed)">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OpenedForPedestrian" summary="Closure is in the Pedestrian position">
+        <mandatoryConform>
+          <feature name="PD"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="OpenedForVentilation" summary="Closure is in the Ventilation position">
+        <mandatoryConform>
+          <feature name="VT"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="OpenedAtSignature" summary="Closure is in its &quot;Signature position&quot;">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MainStateEnum">
+      <item value="0" name="Stopped" summary="Closure is stopped">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Moving" summary="Closure is actively moving">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="WaitingForMotion" summary="Closure is waiting before a motion (e.g. pre-heat, pre-check)">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Error" summary="Closure is in an error state">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Calibrating" summary="Closure is currently calibrating its Opened and Closed limits to determine effective physical range">
+        <mandatoryConform>
+          <feature name="CL"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="Protected" summary="Some protective measures are activated to prevent damage to the closure. Commands MAY be rejected.">
+        <mandatoryConform>
+          <feature name="PT"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="Disengaged" summary="Closure has a disengaged element preventing any actuator movements">
+        <mandatoryConform>
+          <feature name="MO"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="SetupRequired" summary="Movement commands are ignored since the closure is not operational and requires further setup and/or calibration">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TargetPositionEnum">
+      <item value="0" name="MoveToFullyClosed" summary="Move to a fully closed state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MoveToFullyOpen" summary="Move to a fully open state">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="MoveToPedestrianPosition" summary="Move to the Pedestrian position">
+        <mandatoryConform>
+          <feature name="PD"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="MoveToVentilationPosition" summary="Move to the Ventilation position">
+        <mandatoryConform>
+          <feature name="VT"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="MoveToSignaturePosition" summary="Move to the Signature position">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="LatchControlModesBitmap">
+      <bitfield name="RemoteLatching" bit="0" summary="Remote latching capability">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="RemoteUnlatching" bit="1" summary="Remote unlatching capability">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <struct name="OverallCurrentStateStruct">
+      <field id="0" name="Position" type="CurrentPositionEnum" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Latch" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum" default="MS">
+        <mandatoryConform>
+          <feature name="SP"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="SecureState" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="OverallTargetStateStruct">
+      <field id="0" name="Position" type="TargetPositionEnum" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PS"/>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="Latch" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum" default="MS">
+        <mandatoryConform>
+          <feature name="SP"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CountdownTime" type="elapsed-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="PS"/>
+          <notTerm>
+            <feature name="IS"/>
+          </notTerm>
+        </andTerm>
+      </optionalConform>
+      <constraint>
+        <max value="259200"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MainState" type="MainStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="CurrentErrorList" type="list">
+      <entry type="ClosureErrorEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="10"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="OverallCurrentState" type="OverallCurrentStateStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="OverallTargetState" type="OverallTargetStateStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="LatchControlModes" type="LatchControlModesBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Stop" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="IS"/>
+        </notTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x01" name="MoveTo" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Position" type="TargetPositionEnum" default="desc">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="1" name="Latch" type="bool" default="desc">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum">
+        <default>
+          <enum default="Auto"/>
+        </default>
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+    </command>
+    <command id="0x02" name="Calibrate" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="OperationalError" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ErrorState" type="list">
+        <entry type="ClosureErrorEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="10"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x01" name="MovementCompleted" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="IS"/>
+        </notTerm>
+      </mandatoryConform>
+    </event>
+    <event id="0x02" name="EngageStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MO"/>
+      </mandatoryConform>
+      <field id="0" name="EngageValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x03" name="SecureStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SecureValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ClosureDimension.xml b/data_model/1.6/clusters/ClosureDimension.xml
new file mode 100644
index 00000000000..020c81ae6a5
--- /dev/null
+++ b/data_model/1.6/clusters/ClosureDimension.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0105" name="Closure Dimension Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0105" name="Closure Dimension"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CLDIM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PS" name="Positioning" summary="Supports Positioning in the range from 0.00% to 100.00%">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="LT" name="MotionLatching" summary="Supports a latch to secure the closure to a position or state">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="UT" name="Unit" summary="Specifies the relevant unit and range for this dimension (mm, degrees etc.)">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="LM" name="Limitation" summary="Supports limitation of the operating range">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="SP" name="Speed" summary="Supports speed motion throttling.">
+      <optionalConform>
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="5" code="TR" name="Translation" summary="Drives a translation motion">
+      <optionalConform choice="b">
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="6" code="RO" name="Rotation" summary="Drives a rotation motion">
+      <optionalConform choice="b">
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="7" code="MD" name="Modulation" summary="Modulates a particular flow level (light, air, privacy ...)">
+      <optionalConform choice="b">
+        <feature name="PS"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ClosureUnitEnum">
+      <item value="0" name="Millimeter" summary="Millimeter used as unit">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Degree" summary="Degree used as unit">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ModulationTypeEnum">
+      <item value="0" name="SlatsOrientation" summary="Orientation of the slats">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="SlatsOpenwork" summary="Aperture of the slats">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="StripesAlignment" summary="Alignment of blind stripes (Zebra)">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Opacity" summary="Opacity of a surface">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Ventilation" summary="Ventilation control">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OverflowEnum">
+      <item value="0" name="NoOverflow" summary="No overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Inside" summary="Inside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Outside" summary="Outside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="TopInside" summary="Top inside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="TopOutside" summary="Top outside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="BottomInside" summary="Bottom inside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="BottomOutside" summary="Bottom outside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LeftInside" summary="Left inside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="LeftOutside" summary="Left outside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="RightInside" summary="Right inside overflow">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="RightOutside" summary="Right outside overflow">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="RotationAxisEnum">
+      <item value="0" name="Left" summary="The panel rotates around a vertical axis located on the left side of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CenteredVertical" summary="The panel rotates around a vertical axis located in the center of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="LeftAndRight" summary="The panels rotates around vertical axes located on the left and right sides of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Right" summary="The panel rotates around a vertical axis located on the right side of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Top" summary="The panel rotates around a horizontal axis located on the top of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="CenteredHorizontal" summary="The panel rotates around a horizontal axis located in the center of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="TopAndBottom" summary="The panels rotates around horizontal axes located on the top and bottom of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Bottom" summary="The panel rotates around a horizontal axis located on the bottom of the panel">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="LeftBarrier" summary="The barrier tilts around an axis located at the left end of the barrier">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="LeftAndRightBarriers" summary="The dual barriers tilt around axes located at each side of the composite barrier">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="RightBarrier" summary="The barrier tilts around an axis located at the right end of the barrier">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StepDirectionEnum">
+      <item value="0" name="Decrease" summary="Decrease towards 0.00%">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Increase" summary="Increase towards 100.00%">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TranslationDirectionEnum">
+      <item value="0" name="Downward" summary="Downward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Upward" summary="Upward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="VerticalMask" summary="Vertical mask translation">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="VerticalSymmetry" summary="Vertical symmetry translation">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Leftward" summary="Leftward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Rightward" summary="Rightward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="HorizontalMask" summary="Horizontal mask translation">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="HorizontalSymmetry" summary="Horizontal symmetry translation">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Forward" summary="Forward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Backward" summary="Backward translation">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="DepthMask" summary="Depth mask translation">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="DepthSymmetry" summary="Depth symmetry translation">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="LatchControlModesBitmap">
+      <bitfield name="RemoteLatching" bit="0" summary="Remote latching capability">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="RemoteUnlatching" bit="1" summary="Remote unlatching capability">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <struct name="DimensionStateStruct">
+      <field id="0" name="Position" type="percent100ths" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Latch" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum" default="MS">
+        <mandatoryConform>
+          <feature name="SP"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="RangePercent100thsStruct">
+      <field id="0" name="Min" type="percent100ths">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Max" type="percent100ths">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from>
+              <field name="Min"/>
+            </from>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="UnitRangeStruct">
+      <field id="0" name="Min" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Max" type="int16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from>
+              <field name="Min"/>
+            </from>
+            <to value="32767"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentState" type="DimensionStateStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="TargetState" type="DimensionStateStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="Resolution" type="percent100ths" default="0.01">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PS"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0.01"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="StepValue" type="percent100ths" default="0.01">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PS"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0.01"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="Unit" type="ClosureUnitEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="UT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="UnitRange" type="UnitRangeStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="UT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="LimitRange" type="RangePercent100thsStruct">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LM"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="TranslationDirection" type="TranslationDirectionEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="RotationAxis" type="RotationAxisEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="Overflow" type="OverflowEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="ModulationType" type="ModulationTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MD"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000B" name="LatchControlModes" type="LatchControlModesBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetTarget" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Position" type="percent100ths" default="desc">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="1" name="Latch" type="bool" default="desc">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum">
+        <default>
+          <enum default="Auto"/>
+        </default>
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+    </command>
+    <command id="0x01" name="Step" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="PS"/>
+      </mandatoryConform>
+      <field id="0" name="Direction" type="StepDirectionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NumberOfSteps" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="2" name="Speed" type="ThreeLevelAutoEnum">
+        <default>
+          <enum default="Auto"/>
+        </default>
+        <optionalConform>
+          <feature name="SP"/>
+        </optionalConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ColorControl.xml b/data_model/1.6/clusters/ColorControl.xml
new file mode 100644
index 00000000000..b6108945d6b
--- /dev/null
+++ b/data_model/1.6/clusters/ColorControl.xml
@@ -0,0 +1,1361 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0300" name="Color Control Cluster" revision="9">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 2028"/>
+    <revision revision="2" summary="Added Options attribute, CCB 2085 2104 2124 2230; ZLO 1.0"/>
+    <revision revision="3" summary="CCB 2501 2814 2839 2840 2843 2861"/>
+    <revision revision="4" summary="All Hubs changes"/>
+    <revision revision="5" summary="New data model format and notation, FeatureMap support"/>
+    <revision revision="6" summary="Added clarifications to Scenes support for Matter"/>
+    <revision revision="7" summary="Added Q quality for CurrentHue, CurrentSaturation, CurrentX, CurrentY, ColorTemperatureMireds, EnhancedCurrentHue and RemainingTime attributes. Added clarifications for behavior related to Step values. Added constraints on minimum acceptable color temperature values in mireds."/>
+    <revision revision="8" summary="Change WhitePoint* and ColorPoint* attributes from RW to R (CCB 2490, TCR 11893)"/>
+    <revision revision="9" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0300" name="Color Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="HS" name="HueSaturation" summary="Supports color specification via hue/saturation.">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="EHUE"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="1" code="EHUE" name="EnhancedHue" summary="Enhanced hue is supported.">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="CL"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="CL" name="ColorLoop" summary="Color loop is supported.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="XY" name="XY" summary="Supports color specification via XY.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="CT" name="ColorTemperature" summary="Supports specification of color temperature.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ColorLoopActionEnum">
+      <item value="0" name="Deactivate" summary="De-activate the color loop.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ActivateFromColorLoopStartEnhancedHue" summary="Activate the color loop from the value in the ColorLoopStartEnhancedHue field.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ActivateFromEnhancedCurrentHue" summary="Activate the color loop from the value of the EnhancedCurrentHue attribute.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ColorLoopDirectionEnum">
+      <item value="0" name="Decrement" summary="Decrement the hue in the color loop.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Increment" summary="Increment the hue in the color loop.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ColorModeEnum">
+      <item value="0" name="CurrentHueAndCurrentSaturation" summary="The current hue and saturation attributes determine the color.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CurrentXAndCurrentY" summary="The current X and Y attributes determine the color.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ColorTemperatureMireds" summary="The color temperature attribute determines the color.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DirectionEnum">
+      <item value="0" name="Shortest" summary="Shortest distance">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Longest" summary="Longest distance">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Up" summary="Up">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Down" summary="Down">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DriftCompensationEnum">
+      <item value="0" name="None" summary="There is no compensation.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OtherOrUnknown" summary="The compensation is based on other or unknown mechanism.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="TemperatureMonitoring" summary="The compensation is based on temperature monitoring.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OpticalLuminanceMonitoringAndFeedback" summary="The compensation is based on optical luminance monitoring and feedback.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="OpticalColorMonitoringAndFeedback" summary="The compensation is based on optical color monitoring and feedback.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EnhancedColorModeEnum">
+      <item value="0" name="CurrentHueAndCurrentSaturation" summary="The current hue and saturation attributes determine the color.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CurrentXAndCurrentY" summary="The current X and Y attributes determine the color.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ColorTemperatureMireds" summary="The color temperature attribute determines the color.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EnhancedCurrentHueAndCurrentSaturation" summary="The enhanced current hue and saturation attributes determine the color.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MoveModeEnum">
+      <item value="0" name="Stop" summary="Stop the movement">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Up" summary="Move in an upwards direction">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Down" summary="Move in a downwards direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StepModeEnum">
+      <item value="1" name="Up" summary="Step in an upwards direction">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Down" summary="Step in a downwards direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="ColorCapabilitiesBitmap">
+      <bitfield name="HueSaturation" bit="0" summary="Supports color specification via hue/saturation.">
+        <mandatoryConform>
+          <feature name="HS"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="EnhancedHue" bit="1" summary="Enhanced hue is supported.">
+        <mandatoryConform>
+          <feature name="EHUE"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ColorLoop" bit="2" summary="Color loop is supported.">
+        <mandatoryConform>
+          <feature name="CL"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="XY" bit="3" summary="Supports color specification via XY.">
+        <mandatoryConform>
+          <feature name="XY"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ColorTemperature" bit="4" summary="Supports color specification via color temperature.">
+        <mandatoryConform>
+          <feature name="CT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OptionsBitmap">
+      <bitfield name="ExecuteIfOff" bit="0" summary="Dependency on On/Off cluster">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="UpdateFlagsBitmap">
+      <bitfield name="UpdateAction" bit="0" summary="Device adheres to the associated action field.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="UpdateDirection" bit="1" summary="Device updates the associated direction attribute.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="UpdateTime" bit="2" summary="Device updates the associated time attribute.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="UpdateStartHue" bit="3" summary="Device updates the associated start hue attribute.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentHue" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="254"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentSaturation" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="254"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality quieterReporting="true"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65534"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="CurrentX" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="CurrentY" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="DriftCompensation" type="DriftCompensationEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0006" name="CompensationText" type="string">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="254"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="ColorTemperatureMireds" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="ColorMode" type="ColorModeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000F" name="Options" type="OptionsBitmap">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="NumberOfPrimaries" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="6"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0011" name="Primary1X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="0"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="Primary1Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="0"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="Primary1Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="0"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0015" name="Primary2X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="1"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="Primary2Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="1"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0017" name="Primary2Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="1"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0019" name="Primary3X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="2"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001A" name="Primary3Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="2"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001B" name="Primary3Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="2"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0020" name="Primary4X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="3"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0021" name="Primary4Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="3"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0022" name="Primary4Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="3"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0024" name="Primary5X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="4"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0025" name="Primary5Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="4"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0026" name="Primary5Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="4"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0028" name="Primary6X" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="5"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0029" name="Primary6Y" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="5"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x002A" name="Primary6Intensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterTerm>
+            <attribute name="NumberOfPrimaries"/>
+            <literal value="5"/>
+          </greaterTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0030" name="WhitePointX" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0031" name="WhitePointY" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0032" name="ColorPointRX" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0033" name="ColorPointRY" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0034" name="ColorPointRIntensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0036" name="ColorPointGX" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0037" name="ColorPointGY" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0038" name="ColorPointGIntensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003A" name="ColorPointBX" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x003B" name="ColorPointBY" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x003C" name="ColorPointBIntensity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x4000" name="EnhancedCurrentHue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4001" name="EnhancedColorMode" type="EnhancedColorModeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x4002" name="ColorLoopActive" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x4003" name="ColorLoopDirection" type="ColorLoopDirectionEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4004" name="ColorLoopTime" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4005" name="ColorLoopStartEnhancedHue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4006" name="ColorLoopStoredEnhancedHue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x400A" name="ColorCapabilities" type="ColorCapabilitiesBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="0x001F"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x400B" name="ColorTempPhysicalMinMireds" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="65279"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x400C" name="ColorTempPhysicalMaxMireds" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="65279"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x400D" name="CoupleColorTempToLevelMinMireds" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="ColorTempPhysicalMinMireds"/>
+          </from>
+          <to>
+            <attribute name="ColorTemperatureMireds"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x4010" name="StartUpColorTemperatureMireds" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="65279"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="MoveToHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Hue" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="Direction" type="DirectionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="MoveHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="StepHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="StepModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="MoveToSaturation" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="MoveSaturation" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="StepSaturation" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="StepModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="MoveToHueAndSaturation" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Hue" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="MoveToColor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="ColorX" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="1" name="ColorY" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="MoveColor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="RateX" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RateY" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x09" name="StepColor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="StepX" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StepY" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="MoveToColorTemperature" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="ColorTemperatureMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x40" name="EnhancedMoveToHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="EnhancedHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Direction" type="DirectionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x41" name="EnhancedMoveHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Rate" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x42" name="EnhancedStepHue" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="StepModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="StepSize" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x43" name="EnhancedMoveToHueAndSaturation" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="EnhancedHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x44" name="ColorLoopSet" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+      <field id="0" name="UpdateFlags" type="UpdateFlagsBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Action" type="ColorLoopActionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Direction" type="ColorLoopDirectionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Time" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="StartHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="6" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x47" name="StopMoveStep" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="HS"/>
+          <feature name="XY"/>
+          <feature name="CT"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x4B" name="MoveColorTemperature" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Rate" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ColorTemperatureMinimumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="3" name="ColorTemperatureMaximumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x4C" name="StepColorTemperature" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="StepModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StepSize" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="3" name="ColorTemperatureMinimumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="4" name="ColorTemperatureMaximumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65279"/>
+        </constraint>
+      </field>
+      <field id="5" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="6" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/CommissionerControlCluster.xml b/data_model/1.6/clusters/CommissionerControlCluster.xml
new file mode 100644
index 00000000000..6082e2f905d
--- /dev/null
+++ b/data_model/1.6/clusters/CommissionerControlCluster.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0751" name="Commissioner Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0751" name="Commissioner Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="CCTRL" scope="Node"/>
+  <dataTypes>
+    <bitmap name="SupportedDeviceCategoryBitmap">
+      <bitfield name="FabricSynchronization" bit="0" summary="Aggregators which support Fabric Synchronization may be commissioned.">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedDeviceCategories" type="SupportedDeviceCategoryBitmap" default="0">
+      <access read="true" readPrivilege="manage"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="RequestCommissioningApproval" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="RequestID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ProductID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Label" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="CommissionNode" direction="commandToServer" response="ReverseOpenCommissioningWindow">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="RequestID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ResponseTimeoutSeconds" type="uint16" default="30">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="30"/>
+            <to value="120"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="ReverseOpenCommissioningWindow" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="PAKEPasscodeVerifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="97"/>
+        </constraint>
+      </field>
+      <field id="2" name="Discriminator" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="4095"/>
+        </constraint>
+      </field>
+      <field id="3" name="Iterations" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1000"/>
+            <to value="100000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="Salt" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="16"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="CommissioningRequestResult" priority="info">
+      <access readPrivilege="manage" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="0" name="RequestID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ClientNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StatusCode" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/CommodityMetering.xml b/data_model/1.6/clusters/CommodityMetering.xml
new file mode 100644
index 00000000000..785d9112663
--- /dev/null
+++ b/data_model/1.6/clusters/CommodityMetering.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B07" name="Commodity Metering Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0B07" name="Commodity Metering"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="COMMTR" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="MeteredQuantityStruct">
+      <field id="0" name="TariffComponentIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="128"/>
+        </constraint>
+      </field>
+      <field id="1" name="Quantity" type="int64">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeteredQuantity" type="list">
+      <entry type="MeteredQuantityStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="MaximumMeteredQuantities"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MeteredQuantityTimestamp" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="TariffUnit" type="TariffUnitEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="MaximumMeteredQuantities" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/CommodityPrice.xml b/data_model/1.6/clusters/CommodityPrice.xml
new file mode 100644
index 00000000000..56ee9dc642d
--- /dev/null
+++ b/data_model/1.6/clusters/CommodityPrice.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0095" name="Commodity Price Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Updated from SE1.4 version; CCB 1447 2964 2965"/>
+    <revision revision="3" summary="CCBs 2043 2706 2810 2912 3566"/>
+    <revision revision="4" summary="Initial Matter revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0095" name="Commodity Price"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SEPR" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="FORE" name="Forecasting" summary="Forecasts upcoming pricing">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="CommodityPriceDetailBitmap">
+      <bitfield name="Description" bit="0" summary="A textual description of a price; e.g. the name of a rate plan.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Components" bit="1" summary="A breakdown of the component parts of a price; e.g. generation, delivery, etc.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="CommodityPriceComponentStruct">
+      <field id="0" name="Price" type="money">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Source" type="TariffPriceTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Description" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="3" name="TariffComponentID" type="uint32">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="CommodityPriceStruct">
+      <field id="0" name="PeriodStart" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="PeriodStart"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="2" name="Price" type="money">
+        <optionalConform choice="b" more="true" min="1"/>
+      </field>
+      <field id="3" name="PriceLevel" type="int16">
+        <optionalConform choice="b" more="true" min="1"/>
+      </field>
+      <field id="4" name="Description" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="5" name="Components" type="list" default="empty">
+        <entry type="CommodityPriceComponentStruct"/>
+        <optionalConform>
+          <field name="Price"/>
+        </optionalConform>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TariffUnit" type="TariffUnitEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Currency" type="CurrencyStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="CurrentPrice" type="CommodityPriceStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="PriceForecast" type="list">
+      <entry type="CommodityPriceStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FORE"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="56"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="GetDetailedPriceRequest" direction="commandToServer" response="GetDetailedPriceResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="Details" type="CommodityPriceDetailBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="GetDetailedPriceResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <command name="GetDetailedPriceRequest"/>
+      </mandatoryConform>
+      <field id="0" name="CurrentPrice" type="CommodityPriceStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="GetDetailedForecastRequest" direction="commandToServer" response="GetDetailedForecastResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="FORE"/>
+      </optionalConform>
+      <field id="0" name="Details" type="CommodityPriceDetailBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="GetDetailedForecastResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform>
+        <command name="GetDetailedForecastRequest"/>
+      </mandatoryConform>
+      <field id="0" name="PriceForecast" type="list">
+        <entry type="CommodityPriceStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="56"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="PriceChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="CurrentPrice" type="CommodityPriceStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/CommodityTariff.xml b/data_model/1.6/clusters/CommodityTariff.xml
new file mode 100644
index 00000000000..4638a72546c
--- /dev/null
+++ b/data_model/1.6/clusters/CommodityTariff.xml
@@ -0,0 +1,604 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0700" name="Commodity Tariff Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Matter revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0700" name="Commodity Tariff"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SETRF" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PRICE" name="Pricing" summary="Supports information about commodity pricing">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="FCRED" name="FriendlyCredit" summary="Supports information about when friendly credit periods begin and end">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="AUXLD" name="AuxiliaryLoad" summary="Supports information about when auxiliary loads should be enabled or disabled">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="PEAKP" name="PeakPeriod" summary="Supports information about peak periods">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="RNDM" name="Randomization" summary="Supports information about randomization of calendar day entries">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AuxiliaryLoadSettingEnum">
+      <item value="0" name="Off" summary="The switch should be in the OFF state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="On" summary="The switch should be in the ON state">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="None" summary="No state is required">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BlockModeEnum">
+      <item value="0" name="NoBlock" summary="Tariff has no usage blocks">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Combined" summary="Usage is metered in combined blocks">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Individual" summary="Usage is metered separately by tariff component">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DayEntryRandomizationTypeEnum">
+      <item value="0" name="None" summary="No randomization applied">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Fixed" summary="An unchanging offset">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Random" summary="A random value">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="RandomPositive" summary="A random positive value">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="RandomNegative" summary="A random negative value">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DayTypeEnum">
+      <item value="0" name="Standard" summary="Standard">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Holiday" summary="Holiday">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Dynamic" summary="Dynamic Pricing">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Event" summary="Individual Events">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PeakPeriodSeverityEnum">
+      <item value="0" name="Unused" summary="Unused">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Low">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Medium" summary="Medium">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="High" summary="High">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="DayPatternDayOfWeekBitmap">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AuxiliaryLoadSwitchSettingsStruct">
+      <field id="0" name="Number" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RequiredState" type="AuxiliaryLoadSettingEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="AuxiliaryLoadSwitchesSettingsStruct">
+      <field id="0" name="SwitchStates" type="list">
+        <entry type="AuxiliaryLoadSwitchSettingsStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="CalendarPeriodStruct">
+      <field id="0" name="StartDate" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <attribute name="StartDate"/>
+          </min>
+        </constraint>
+      </field>
+      <field id="1" name="DayPatternIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="7"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="DayEntryStruct">
+      <field id="0" name="DayEntryID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StartTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="1499"/>
+        </constraint>
+      </field>
+      <field id="2" name="Duration" type="uint16">
+        <optionalConform/>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left value="1500"/>
+              <right>
+                <field name="StartTime"/>
+              </right>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="3" name="RandomizationOffset" type="int16">
+        <optionalConform>
+          <feature name="RNDM"/>
+        </optionalConform>
+      </field>
+      <field id="4" name="RandomizationType" type="DayEntryRandomizationTypeEnum" default="None">
+        <optionalConform>
+          <feature name="RNDM"/>
+        </optionalConform>
+      </field>
+    </struct>
+    <struct name="DayPatternStruct">
+      <field id="0" name="DayPatternID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DaysOfWeek" type="DayPatternDayOfWeekBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DayEntryIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="96"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="DayStruct">
+      <field id="0" name="Date" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DayType" type="DayTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DayEntryIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="96"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="PeakPeriodStruct">
+      <field id="0" name="Severity" type="PeakPeriodSeverityEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeakPeriod" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TariffComponentStruct">
+      <field id="0" name="TariffComponentID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Price" type="TariffPriceStruct">
+        <quality nullable="true"/>
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="PRICE"/>
+        </optionalConform>
+      </field>
+      <field id="2" name="FriendlyCredit" type="bool">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="FCRED"/>
+        </optionalConform>
+      </field>
+      <field id="3" name="AuxiliaryLoad" type="AuxiliaryLoadSwitchSettingsStruct">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="AUXLD"/>
+        </optionalConform>
+      </field>
+      <field id="4" name="PeakPeriod" type="PeakPeriodStruct" default="0">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="PEAKP"/>
+        </optionalConform>
+      </field>
+      <field id="5" name="PowerThreshold" type="PowerThresholdStruct" default="0">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="PWRTHLD"/>
+        </optionalConform>
+      </field>
+      <field id="6" name="Threshold" type="int64">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Label" type="string">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="8" name="Predicted" type="bool">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="TariffInformationStruct">
+      <field id="0" name="TariffLabel" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="1" name="ProviderName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="2" name="Currency" type="CurrencyStruct">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PRICE"/>
+        </mandatoryConform>
+      </field>
+      <field id="3" name="BlockMode" type="BlockModeEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TariffPeriodStruct">
+      <field id="0" name="Label" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="1" name="DayEntryIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="20"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="2" name="TariffComponentIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="20"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TariffPriceStruct">
+      <field id="0" name="PriceType" type="TariffPriceTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Price" type="money">
+        <optionalConform choice="c" more="true" min="1"/>
+      </field>
+      <field id="2" name="PriceLevel" type="int16">
+        <optionalConform choice="c" more="true" min="1"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TariffInfo" type="TariffInformationStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="TariffUnit" type="TariffUnitEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartDate" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="DayEntries" type="list">
+      <entry type="DayEntryStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="672"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="DayPatterns" type="list">
+      <entry type="DayPatternStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="28"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="CalendarPeriods" type="list">
+      <entry type="CalendarPeriodStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="4"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="IndividualDays" type="list">
+      <entry type="DayStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="50"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="CurrentDay" type="DayStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="NextDay" type="DayStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0009" name="CurrentDayEntry" type="DayEntryStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000A" name="CurrentDayEntryDate" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000B" name="NextDayEntry" type="DayEntryStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000C" name="NextDayEntryDate" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000D" name="TariffComponents" type="list">
+      <entry type="TariffComponentStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="672"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="TariffPeriods" type="list">
+      <entry type="TariffPeriodStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="672"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="CurrentTariffComponents" type="list">
+      <entry type="TariffComponentStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="20"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="NextTariffComponents" type="list">
+      <entry type="TariffComponentStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="20"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0011" name="DefaultRandomizationOffset" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="RNDM"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="DefaultRandomizationType" type="DayEntryRandomizationTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="RNDM"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="GetTariffComponent" direction="commandToServer" response="GetTariffComponentResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="TariffComponentID" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x00" name="GetTariffComponentResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Label" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="1" name="DayEntryIDs" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="96"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="2" name="TariffComponent" type="TariffComponentStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="GetDayEntry" direction="commandToServer" response="GetDayEntryResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="DayEntryID" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="GetDayEntryResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="DayEntry" type="DayEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ConcentrationMeasurement.xml b/data_model/1.6/clusters/ConcentrationMeasurement.xml
new file mode 100644
index 00000000000..190ffa82d2b
--- /dev/null
+++ b/data_model/1.6/clusters/ConcentrationMeasurement.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Concentration Measurement Clusters" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2882"/>
+    <revision revision="3" summary="Cluster redesigned to add support for Level Indication, Peak/Average Measurement, Medium/Unit of Measurement and Uncertainty."/>
+    <revision revision="4" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x040C" name="Carbon Monoxide Concentration Measurement" picsCode="CMOCONC"/>
+    <clusterId id="0x040D" name="Carbon Dioxide Concentration Measurement" picsCode="CDOCONC"/>
+    <clusterId id="0x0413" name="Nitrogen Dioxide Concentration Measurement" picsCode="NDOCONC"/>
+    <clusterId id="0x0415" name="Ozone Concentration Measurement" picsCode="OZCONC"/>
+    <clusterId id="0x042A" name="PM2.5 Concentration Measurement" picsCode="PMICONC"/>
+    <clusterId id="0x042B" name="Formaldehyde Concentration Measurement" picsCode="FLDCONC"/>
+    <clusterId id="0x042C" name="PM1 Concentration Measurement" picsCode="PMHCONC"/>
+    <clusterId id="0x042D" name="PM10 Concentration Measurement" picsCode="PMKCONC"/>
+    <clusterId id="0x042E" name="Total Volatile Organic Compounds Concentration Measurement" picsCode="TVOCCONC"/>
+    <clusterId id="0x042F" name="Radon Concentration Measurement" picsCode="RNCONC"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CONC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="MEA" name="NumericMeasurement" summary="Cluster supports numeric measurement of substance">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="LEV" name="LevelIndication" summary="Cluster supports basic level indication for substance using the ConcentrationLevel enum">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="MED" name="MediumLevel" summary="Cluster supports the Medium Concentration Level">
+      <optionalConform>
+        <feature name="LEV"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="CRI" name="CriticalLevel" summary="Cluster supports the Critical Concentration Level">
+      <optionalConform>
+        <feature name="LEV"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="PEA" name="PeakMeasurement" summary="Cluster supports peak numeric measurement of substance">
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+    </feature>
+    <feature bit="5" code="AVG" name="AverageMeasurement" summary="Cluster supports average numeric measurement of substance">
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="LevelValueEnum">
+      <item value="0" name="Unknown" summary="The level is Unknown">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="The level is considered Low">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Medium" summary="The level is considered Medium">
+        <mandatoryConform>
+          <feature name="MED"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="High" summary="The level is considered High">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Critical" summary="The level is considered Critical">
+        <mandatoryConform>
+          <feature name="CRI"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="MeasurementMediumEnum">
+      <item value="0" name="Air" summary="The measurement is being made in Air">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Water" summary="The measurement is being made in Water">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Soil" summary="The measurement is being made in Soil">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MeasurementUnitEnum">
+      <item value="0" name="PPM" summary="Parts per Million (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="PPB" summary="Parts per Billion (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="PPT" summary="Parts per Trillion (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="MGM3" summary="Milligram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="UGM3" summary="Microgram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="NGM3" summary="Nanogram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="PM3" summary="Particles per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="BQM3" summary="Becquerel per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="single">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="single">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="single">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+      <constraint>
+        <min>
+          <attribute name="MinMeasuredValue"/>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="PeakMeasuredValue" type="single">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PEA"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="PeakMeasuredValueWindow" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PEA"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="604800"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="AverageMeasuredValue" type="single">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AVG"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="AverageMeasuredValueWindow" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="AVG"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="604800"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="Uncertainty" type="single" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+      <constraint>
+        <allowed value="MS"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="MeasurementUnit" type="MeasurementUnitEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="MeasurementMedium" type="MeasurementMediumEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000A" name="LevelValue" type="LevelValueEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LEV"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ContentAppObserver.xml b/data_model/1.6/clusters/ContentAppObserver.xml
new file mode 100644
index 00000000000..d7fa594a328
--- /dev/null
+++ b/data_model/1.6/clusters/ContentAppObserver.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0510" name="Content App Observer Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0510" name="Content App Observer"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="APPOBSERVER" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UnexpectedData" summary="Data field in command was not understood by the Observer">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="ContentAppMessage" direction="commandToServer" response="ContentAppMessageResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Data" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="500"/>
+        </constraint>
+      </field>
+      <field id="1" name="EncodingHint" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="100"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ContentAppMessageResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="500"/>
+        </constraint>
+      </field>
+      <field id="2" name="EncodingHint" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="100"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ContentControl.xml b/data_model/1.6/clusters/ContentControl.xml
new file mode 100644
index 00000000000..7f4237f66bf
--- /dev/null
+++ b/data_model/1.6/clusters/ContentControl.xml
@@ -0,0 +1,517 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050F" name="Content Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050F" name="Content Control">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CONCON" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="ST" name="ScreenTime" summary="Supports managing screen time limits.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="PM" name="PINManagement" summary="Supports managing a PIN code which is used for restricting access to configuration of this feature.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="BU" name="BlockUnrated" summary="Supports managing content controls for unrated content.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="OCR" name="OnDemandContentRating" summary="Supports managing content controls based upon rating threshold for on demand content.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="SCR" name="ScheduledContentRating" summary="Supports managing content controls based upon rating threshold for scheduled content.">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="BC" name="BlockChannels" summary="Supports managing a set of channels that are prohibited.">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="BA" name="BlockApplications" summary="Supports managing a set of applications that are prohibited.">
+      <optionalConform/>
+    </feature>
+    <feature bit="7" code="BTW" name="BlockContentTimeWindow" summary="Supports managing content controls based upon setting time window in which all contents and applications SHALL be blocked.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="InvalidPINCode" summary="Provided PIN Code does not match the current PIN code.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="InvalidRating" summary="Provided Rating is out of scope of the corresponding Rating list.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="InvalidChannel" summary="Provided Channel(s) is invalid.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x05" name="ChannelAlreadyExist" summary="Provided Channel(s) already exists.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x06" name="ChannelNotExist" summary="Provided Channel(s) doesn&apos;t exist in BlockChannelList attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x07" name="UnidentifiableApplication" summary="Provided Application(s) is not identified.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x08" name="ApplicationAlreadyExist" summary="Provided Application(s) already exists.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x09" name="ApplicationNotExist" summary="Provided Application(s) doesn&apos;t exist in BlockApplicationList attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0A" name="TimeWindowAlreadyExist" summary="Provided time Window already exists in BlockContentTimeWindow attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0B" name="TimeWindowNotExist" summary="Provided time window doesn&apos;t exist in BlockContentTimeWindow attribute.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="DayOfWeekBitmap">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AppInfoStruct">
+      <field id="0" name="CatalogVendorID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ApplicationID" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="BlockChannelStruct">
+      <field id="0" name="BlockChannelIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MajorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Identifier" type="string">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="RatingNameStruct">
+      <field id="0" name="RatingName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="8"/>
+        </constraint>
+      </field>
+      <field id="1" name="RatingNameDesc" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TimePeriodStruct">
+      <field id="0" name="StartHour" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="23"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="StartMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="59"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="EndHour" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="23"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="EndMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="59"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TimeWindowStruct">
+      <field id="0" name="TimeWindowIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DayOfWeek" type="DayOfWeekBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="TimePeriod" type="list">
+        <entry type="TimePeriodStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Enabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="OnDemandRatings" type="list">
+      <entry type="RatingNameStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="OnDemandRatingThreshold" type="string">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="ScheduledContentRatings" type="list">
+      <entry type="RatingNameStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="ScheduledContentRatingThreshold" type="string">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="ScreenDailyTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="86400"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="RemainingScreenTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="86400"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="BlockUnrated" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="BlockChannelList" type="list">
+      <entry type="BlockChannelStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="BlockApplicationList" type="list">
+      <entry type="AppInfoStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="BlockContentTimeWindow" type="list">
+      <entry type="TimeWindowStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BTW"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="7"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="UpdatePIN" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform>
+        <feature name="PM"/>
+      </mandatoryConform>
+      <field id="0" name="OldPIN" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="6"/>
+        </constraint>
+      </field>
+      <field id="1" name="NewPIN" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="6"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ResetPIN" direction="commandToServer" response="ResetPINResponse">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="PM"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="ResetPINResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="PM"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="6"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="Enable" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x04" name="Disable" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="AddBonusTime" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="6"/>
+        </constraint>
+      </field>
+      <field id="1" name="BonusTime" type="elapsed-s" default="300">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="SetScreenDailyTime" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <field id="0" name="ScreenTime" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <max value="86400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="BlockUnratedContent" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x08" name="UnblockUnratedContent" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x09" name="SetOnDemandRatingThreshold" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+      <field id="0" name="Rating" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="8"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="SetScheduledContentRatingThreshold" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+      <field id="0" name="Rating" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="8"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0B" name="AddBlockChannels" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BC"/>
+      </mandatoryConform>
+      <field id="0" name="Channels" type="list">
+        <entry type="BlockChannelStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0C" name="RemoveBlockChannels" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BC"/>
+      </mandatoryConform>
+      <field id="0" name="ChannelIndexes" type="list">
+        <entry type="uint16"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0D" name="AddBlockApplications" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BA"/>
+      </mandatoryConform>
+      <field id="0" name="Applications" type="list">
+        <entry type="AppInfoStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0E" name="RemoveBlockApplications" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BA"/>
+      </mandatoryConform>
+      <field id="0" name="Applications" type="list">
+        <entry type="AppInfoStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0F" name="SetBlockContentTimeWindow" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BTW"/>
+      </mandatoryConform>
+      <field id="0" name="TimeWindow" type="TimeWindowStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x10" name="RemoveBlockContentTimeWindow" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="BTW"/>
+      </mandatoryConform>
+      <field id="0" name="TimeWindowIndexes" type="list">
+        <entry type="uint16"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="RemainingScreenTimeExpired" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x01" name="EnteringBlockContentTimeWindow" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BTW"/>
+      </mandatoryConform>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ContentLauncher.xml b/data_model/1.6/clusters/ContentLauncher.xml
new file mode 100644
index 00000000000..588ff7f34b0
--- /dev/null
+++ b/data_model/1.6/clusters/ContentLauncher.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050A" name="Content Launcher Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add Seasons, Episode, Any and CurrentContext to search, Added Text/Audio tracks support with PlaybackPreferences field"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050A" name="Content Launcher"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="CONTENTLAUNCHER" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CS" name="ContentSearch" summary="Device supports content search (non-app specific)">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="UP" name="URLPlayback" summary="Device supports basic URL-based file playback">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="AS" name="AdvancedSeek" summary="Enables clients to implement more advanced media seeking behavior in their user interface, such as for example a &quot;seek bar&quot;.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="TT" name="TextTracks" summary="Device or app supports Text Tracks.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="AT" name="AudioTracks" summary="Device or app supports Audio Tracks.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MetricTypeEnum">
+      <item value="0" name="Pixels" summary="Dimensions defined in a number of Pixels">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Percentage" summary="Dimensions defined as a percentage">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ParameterEnum">
+      <item value="0" name="Actor" summary="Actor represents an actor credited in video media content; for example, “Gaby Hoffman”">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Channel" summary="Channel represents the identifying data for a television channel; for example, &quot;PBS&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Character" summary="A character represented in video media content; for example, “Snow White”">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Director" summary="A director of the video media content; for example, “Spike Lee”">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Event" summary="An event is a reference to a type of event; examples would include sports, music, or other types of events. For example, searching for &quot;Football games&quot; would search for a &apos;game&apos; event entity and a &apos;football&apos; sport entity.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Franchise" summary="A franchise is a video entity which can represent a number of video entities, like movies or TV shows. For example, take the fictional franchise &quot;Intergalactic Wars&quot; which represents a collection of movie trilogies, as well as animated and live action TV shows. This entity type was introduced to account for requests by customers such as &quot;Find Intergalactic Wars movies&quot;, which would search for all &apos;Intergalactic Wars&apos; programs of the MOVIE MediaType, rather than attempting to match to a single title.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Genre" summary="Genre represents the genre of video media content such as action, drama or comedy.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="League" summary="League represents the categorical information for a sporting league; for example, &quot;NCAA&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Popularity" summary="Popularity indicates whether the user asks for popular content.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Provider" summary="The provider (MSP) the user wants this media to be played on; for example, &quot;Netflix&quot;.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Sport" summary="Sport represents the categorical information of a sport; for example, football">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="SportsTeam" summary="SportsTeam represents the categorical information of a professional sports team; for example, &quot;University of Washington Huskies&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Type" summary="The type of content requested. Supported types are &quot;Movie&quot;, &quot;MovieSeries&quot;, &quot;TVSeries&quot;, &quot;TVSeason&quot;, &quot;TVEpisode&quot;, &quot;Trailer&quot;, &quot;SportsEvent&quot;, &quot;LiveEvent&quot;, and &quot;Video&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Video" summary="Video represents the identifying data for a specific piece of video content; for example, &quot;Manchester by the Sea&quot;.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="Season" summary="Season represents the specific season number within a TV series.">
+        <optionalConform/>
+      </item>
+      <item value="15" name="Episode" summary="Episode represents a specific episode number within a Season in a TV series.">
+        <optionalConform/>
+      </item>
+      <item value="16" name="Any" summary="Represents a search text input across many parameter types or even outside of the defined param types.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="URLNotAvailable" summary="Requested URL could not be reached by device.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AuthFailed" summary="Requested URL returned 401 error code.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="TextTrackNotAvailable" summary="Requested Text Track (in PlaybackPreferences) not available">
+        <mandatoryConform>
+          <feature name="TT"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="AudioTrackNotAvailable" summary="Requested Audio Track (in PlaybackPreferences) not available">
+        <mandatoryConform>
+          <feature name="AT"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="SupportedProtocolsBitmap">
+      <bitfield name="DASH" bit="0" summary="Device supports Dynamic Adaptive Streaming over HTTP (DASH)">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HLS" bit="1" summary="Device supports HTTP Live Streaming (HLS)">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AdditionalInfoStruct">
+      <field id="0" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="1" name="Value" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="BrandingInformationStruct">
+      <field id="0" name="ProviderName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="1" name="Background" type="StyleInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Logo" type="StyleInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="3" name="ProgressBar" type="StyleInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="4" name="Splash" type="StyleInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="5" name="WaterMark" type="StyleInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="ContentSearchStruct">
+      <field id="0" name="ParameterList" type="list" default="0">
+        <entry type="ParameterStruct"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DimensionStruct">
+      <field id="0" name="Width" type="double" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Height" type="double" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Metric" type="MetricTypeEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ParameterStruct">
+      <field id="0" name="Type" type="ParameterEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Value" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="1024"/>
+        </constraint>
+      </field>
+      <field id="2" name="ExternalIDList" type="list" default="empty">
+        <entry type="AdditionalInfoStruct"/>
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="PlaybackPreferencesStruct">
+      <field id="0" name="PlaybackPosition" type="uint64">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="TextTrack" type="TrackPreferenceStruct">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="TT"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="AudioTracks" type="list">
+        <entry type="TrackPreferenceStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="AT"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="StyleInformationStruct">
+      <field id="0" name="ImageURL" type="string" default="MS">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="1" name="Color" type="string" default="MS">
+        <optionalConform/>
+        <constraint>
+          <allowed value="7"/>
+        </constraint>
+        <constraint>
+          <allowed value="9"/>
+        </constraint>
+      </field>
+      <field id="2" name="Size" type="DimensionStruct" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="TrackPreferenceStruct">
+      <field id="0" name="LanguageCode" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="Characteristics" type="list" default="null">
+        <entry type="CharacteristicEnum"/>
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="AudioOutputIndex" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="AT"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AcceptHeader" type="list" default="empty">
+      <entry type="string">
+        <constraint>
+          <maxLength value="1024"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="100"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SupportedStreamingProtocols" type="SupportedProtocolsBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="LaunchContent" direction="commandToServer" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CS"/>
+      </mandatoryConform>
+      <field id="0" name="Search" type="ContentSearchStruct">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="AutoPlay" type="bool">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="3" name="PlaybackPreferences" type="PlaybackPreferencesStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="4" name="UseCurrentContext" type="bool" default="true">
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="LaunchURL" direction="commandToServer" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+      <field id="0" name="ContentURL" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="8192"/>
+        </constraint>
+      </field>
+      <field id="1" name="DisplayString" type="string" default="MS">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="2" name="BrandingInformation" type="BrandingInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="3" name="PlaybackPreferences" type="PlaybackPreferencesStruct" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x02" name="LauncherResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CS"/>
+          <feature name="UP"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Descriptor-Cluster.xml b/data_model/1.6/clusters/Descriptor-Cluster.xml
new file mode 100644
index 00000000000..475dd6f8d57
--- /dev/null
+++ b/data_model/1.6/clusters/Descriptor-Cluster.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001D" name="Descriptor Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Semantic tag list; TagList feature"/>
+    <revision revision="3" summary="Add EndpointUniqueID attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x001D" name="Descriptor"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DESC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TAGLIST" name="TagList" summary="The TagList attribute is present">
+      <describedConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="DeviceTypeStruct">
+      <field id="0" name="DeviceType" type="devtype-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Revision" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceTypeList" type="list" default="desc">
+      <entry type="DeviceTypeStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <minCount value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ServerList" type="list" default="empty">
+      <entry type="cluster-id"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ClientList" type="list" default="empty">
+      <entry type="cluster-id"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="PartsList" type="list" default="empty">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="TagList" type="list" default="MS">
+      <entry type="SemanticTagStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TAGLIST"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="6"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="EndpointUniqueID" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/DeviceEnergyManagement.xml b/data_model/1.6/clusters/DeviceEnergyManagement.xml
new file mode 100644
index 00000000000..87946abe764
--- /dev/null
+++ b/data_model/1.6/clusters/DeviceEnergyManagement.xml
@@ -0,0 +1,710 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0098" name="Device Energy Management Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Updates after 0.7 Ballot review"/>
+    <revision revision="3" summary="Updates to match cluster spec updates"/>
+    <revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0098" name="Device Energy Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PA" name="PowerAdjustment" summary="Allows an EMS to make a temporary power adjustment (within the limits offered by the ESA).">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="PFR" name="PowerForecastReporting" summary="Allows an ESA to advertise its indicative future power consumption vs time.">
+      <otherwiseConform>
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="PA"/>
+          </notTerm>
+        </optionalConform>
+        <mandatoryConform>
+          <orTerm>
+            <feature name="STA"/>
+            <feature name="PAU"/>
+            <feature name="FA"/>
+            <feature name="CON"/>
+          </orTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="SFR" name="StateForecastReporting" summary="Allows an ESA to advertise its indicative future state vs time.">
+      <optionalConform choice="a">
+        <notTerm>
+          <feature name="PA"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="STA" name="StartTimeAdjustment" summary="Allows an EMS to delay an ESA&apos;s planned operation.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="PAU" name="Pausable" summary="Allows an EMS to pause an ESA&apos;s planned operation.">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="FA" name="ForecastAdjustment" summary="Allows an EMS to adjust an ESA&apos;s planned operation.">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="CON" name="ConstraintBasedAdjustment" summary="Allows an EMS to request constraints to an ESA&apos;s planned operation.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AdjustmentCauseEnum">
+      <item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="CauseEnum">
+      <item value="0" name="NormalCompletion" summary="The ESA completed the power adjustment as requested">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Offline" summary="The ESA was set to offline">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Fault" summary="The ESA has developed a fault could not complete the adjustment">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="UserOptOut" summary="The user has disabled the ESA&apos;s flexibility capability">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Cancelled" summary="The adjustment was cancelled by a client">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="CostTypeEnum">
+      <item value="0" name="Financial" summary="Financial cost">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GHGEmissions" summary="Grid CO2e grams cost">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Comfort" summary="Consumer comfort impact cost">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Temperature" summary="Temperature impact cost">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ESAStateEnum">
+      <item value="0" name="Offline" summary="The ESA is not available to the EMS (e.g. start-up, maintenance mode)">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Online" summary="The ESA is working normally and can be controlled by the EMS">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Fault" summary="The ESA has developed a fault and cannot provide service">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PowerAdjustActive" summary="The ESA is in the middle of a power adjustment event">
+        <mandatoryConform>
+          <feature name="PA"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="Paused" summary="The ESA is currently paused by a client using the PauseRequest command">
+        <mandatoryConform>
+          <feature name="PAU"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="ESATypeEnum">
+      <item value="0" name="EVSE" summary="EV Supply Equipment">
+        <optionalConform/>
+      </item>
+      <item value="1" name="SpaceHeating" summary="Space heating appliance">
+        <optionalConform/>
+      </item>
+      <item value="2" name="WaterHeating" summary="Water heating appliance">
+        <optionalConform/>
+      </item>
+      <item value="3" name="SpaceCooling" summary="Space cooling appliance">
+        <optionalConform/>
+      </item>
+      <item value="4" name="SpaceHeatingCooling" summary="Space heating and cooling appliance">
+        <optionalConform/>
+      </item>
+      <item value="5" name="BatteryStorage" summary="Battery Electric Storage System">
+        <optionalConform/>
+      </item>
+      <item value="6" name="SolarPV" summary="Solar PV inverter">
+        <optionalConform/>
+      </item>
+      <item value="7" name="FridgeFreezer" summary="Fridge / Freezer">
+        <optionalConform/>
+      </item>
+      <item value="8" name="WashingMachine" summary="Washing Machine">
+        <optionalConform/>
+      </item>
+      <item value="9" name="Dishwasher" summary="Dishwasher">
+        <optionalConform/>
+      </item>
+      <item value="10" name="Cooking" summary="Cooking appliance">
+        <optionalConform/>
+      </item>
+      <item value="11" name="HomeWaterPump" summary="Home water pump (e.g. drinking well)">
+        <optionalConform/>
+      </item>
+      <item value="12" name="IrrigationWaterPump" summary="Irrigation water pump">
+        <optionalConform/>
+      </item>
+      <item value="13" name="PoolPump" summary="Pool pump">
+        <optionalConform/>
+      </item>
+      <item value="255" name="Other" summary="Other appliance type">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ForecastUpdateReasonEnum">
+      <item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="GridOptimization" summary="The update was due to grid optimization">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OptOutStateEnum">
+      <item value="0" name="NoOptOut" summary="The user has not opted out of either local or grid optimizations">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LocalOptOut" summary="The user has opted out of local EMS optimizations only">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="GridOptOut" summary="The user has opted out of grid EMS optimizations only">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OptOut" summary="The user has opted out of all external optimizations">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PowerAdjustReasonEnum">
+      <item value="0" name="NoAdjustment" summary="There is no Power Adjustment active">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LocalOptimizationAdjustment" summary="There is PowerAdjustment active due to local EMS optimization">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="GridOptimizationAdjustment" summary="There is PowerAdjustment active due to grid optimization">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ConstraintsStruct">
+      <field id="0" name="StartTime" type="epoch-s">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <max value="86400"/>
+        </constraint>
+      </field>
+      <field id="2" name="NominalPower" type="power-mW">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="MaximumEnergy" type="energy-mWh">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="LoadControl" type="int8">
+        <mandatoryConform>
+          <feature name="SFR"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="CostStruct">
+      <field id="0" name="CostType" type="CostTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Value" type="int32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DecimalPoints" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Currency" type="uint16" default="0">
+        <optionalConform/>
+        <constraint>
+          <max value="999"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ForecastStruct">
+      <field id="0" name="ForecastID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ActiveSlotNumber" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EarliestStartTime" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="STA"/>
+        </mandatoryConform>
+      </field>
+      <field id="5" name="LatestEndTime" type="epoch-s">
+        <mandatoryConform>
+          <feature name="STA"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="IsPausable" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Slots" type="list">
+        <entry type="SlotStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="8" name="ForecastUpdateReason" type="ForecastUpdateReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="PowerAdjustCapabilityStruct">
+      <field id="0" name="PowerAdjustCapability" type="list">
+        <entry type="PowerAdjustStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+      <field id="1" name="Cause" type="PowerAdjustReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="PowerAdjustStruct">
+      <field id="0" name="MinPower" type="power-mW">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxPower" type="power-mW">
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <field name="MinPower"/>
+          </min>
+        </constraint>
+      </field>
+      <field id="2" name="MinDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="MaxDuration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <field name="MinDuration"/>
+          </min>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SlotAdjustmentStruct">
+      <field id="0" name="SlotIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="NominalPower" type="power-mW">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SlotStruct">
+      <field id="0" name="MinDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DefaultDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="ElapsedSlotTime" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="RemainingSlotTime" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SlotIsPausable" type="bool">
+        <mandatoryConform>
+          <feature name="PAU"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="MinPauseDuration" type="elapsed-s">
+        <mandatoryConform>
+          <feature name="PAU"/>
+        </mandatoryConform>
+      </field>
+      <field id="7" name="MaxPauseDuration" type="elapsed-s">
+        <mandatoryConform>
+          <feature name="PAU"/>
+        </mandatoryConform>
+      </field>
+      <field id="8" name="ManufacturerESAState" type="uint16">
+        <mandatoryConform>
+          <feature name="SFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="9" name="NominalPower" type="power-mW">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="10" name="MinPower" type="power-mW">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="11" name="MaxPower" type="power-mW">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="12" name="NominalEnergy" type="energy-mWh">
+        <mandatoryConform>
+          <feature name="PFR"/>
+        </mandatoryConform>
+      </field>
+      <field id="13" name="Costs" type="list">
+        <entry type="CostStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="5"/>
+        </constraint>
+      </field>
+      <field id="14" name="MinPowerAdjustment" type="power-mW">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="FA"/>
+            <feature name="PFR"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+      <field id="15" name="MaxPowerAdjustment" type="power-mW">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="FA"/>
+            <feature name="PFR"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+      <field id="16" name="MinDurationAdjustment" type="elapsed-s">
+        <mandatoryConform>
+          <feature name="FA"/>
+        </mandatoryConform>
+      </field>
+      <field id="17" name="MaxDurationAdjustment" type="elapsed-s">
+        <mandatoryConform>
+          <feature name="FA"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ESAType" type="ESATypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="ESACanGenerate" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ESAState" type="ESAStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="AbsMinPower" type="power-mW">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="AbsMaxPower" type="power-mW">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <min>
+          <attribute name="AbsMinPower"/>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="PowerAdjustmentCapability" type="PowerAdjustCapabilityStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="Forecast" type="ForecastStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PFR"/>
+          <feature name="SFR"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="OptOutState" type="OptOutStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PA"/>
+          <feature name="STA"/>
+          <feature name="PAU"/>
+          <feature name="FA"/>
+          <feature name="CON"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="PowerAdjustRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+      <field id="0" name="Power" type="power-mW">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Cause" type="AdjustmentCauseEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="CancelPowerAdjustRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="StartTimeAdjustRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="STA"/>
+      </mandatoryConform>
+      <field id="0" name="RequestedStartTime" type="epoch-s">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Cause" type="AdjustmentCauseEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PAU"/>
+      </mandatoryConform>
+      <field id="0" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Cause" type="AdjustmentCauseEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PAU"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x05" name="ModifyForecastRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="FA"/>
+      </mandatoryConform>
+      <field id="0" name="ForecastID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SlotAdjustments" type="list">
+        <entry type="SlotAdjustmentStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="2" name="Cause" type="AdjustmentCauseEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CON"/>
+      </mandatoryConform>
+      <field id="0" name="Constraints" type="list">
+        <entry type="ConstraintsStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="1" name="Cause" type="AdjustmentCauseEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="STA"/>
+          <feature name="FA"/>
+          <feature name="CON"/>
+        </orTerm>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="PowerAdjustStart" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x01" name="PowerAdjustEnd" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+      <field id="0" name="Cause" type="CauseEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EnergyUse" type="energy-mWh">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="Paused" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PAU"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x03" name="Resumed" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PAU"/>
+      </mandatoryConform>
+      <field id="0" name="Cause" type="CauseEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticLogsCluster.xml b/data_model/1.6/clusters/DiagnosticLogsCluster.xml
new file mode 100644
index 00000000000..74031d793ba
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticLogsCluster.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0032" name="Diagnostic Logs Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0032" name="Diagnostic Logs"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DLOG" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <dataTypes>
+    <enum name="IntentEnum">
+      <item value="0" name="EndUserSupport" summary="Logs to be used for end-user support">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NetworkDiag" summary="Logs to be used for network diagnostics">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CrashLogs" summary="Obtain crash logs from the Node">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Successful transfer of logs">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Exhausted" summary="All logs have been transferred">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NoLogs" summary="No logs of the requested type available">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Busy" summary="Unable to handle request, retry later">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Denied" summary="The request is denied, no logs being transferred">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TransferProtocolEnum">
+      <item value="0" name="ResponsePayload" summary="Logs to be returned as a response">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BDX" summary="Logs to be returned using BDX">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="RetrieveLogsRequest" direction="commandToServer" response="RetrieveLogsResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Intent" type="IntentEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RequestedProtocol" type="TransferProtocolEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransferFileDesignator" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="RetrieveLogsResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="LogContent" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="1024"/>
+        </constraint>
+      </field>
+      <field id="2" name="UTCTimeStamp" type="epoch-us">
+        <optionalConform/>
+      </field>
+      <field id="3" name="TimeSinceBoot" type="systemtime-us">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticsEthernet.xml b/data_model/1.6/clusters/DiagnosticsEthernet.xml
new file mode 100644
index 00000000000..dcbb3b8c5d6
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticsEthernet.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0037" name="Ethernet Network Diagnostics Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0037" name="Ethernet Network Diagnostics"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DGETH" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Node makes available the counts for the number of received and transmitted packets on the ethernet interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Node makes available the counts for the number of errors that have occurred during the reception and transmission of packets on the ethernet interface.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PHYRateEnum">
+      <item value="0" name="Rate10M" summary="PHY rate is 10Mbps">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Rate100M" summary="PHY rate is 100Mbps">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Rate1G" summary="PHY rate is 1Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Rate2_5G" summary="PHY rate is 2.5Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rate5G" summary="PHY rate is 5Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Rate10G" summary="PHY rate is 10Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Rate40G" summary="PHY rate is 40Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Rate100G" summary="PHY rate is 100Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Rate200G" summary="PHY rate is 200Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Rate400G" summary="PHY rate is 400Gbps">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PHYRate" type="PHYRateEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0001" name="FullDuplex" type="bool" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="PacketRxCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="PacketTxCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="TxErrCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="CollisionCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="CarrierDetect" type="bool" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0008" name="TimeSinceReset" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PKTCNT"/>
+          <feature name="ERRCNT"/>
+        </orTerm>
+      </mandatoryConform>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticsGeneral.xml b/data_model/1.6/clusters/DiagnosticsGeneral.xml
new file mode 100644
index 00000000000..f3dc8ab851a
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticsGeneral.xml
@@ -0,0 +1,447 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0033" name="General Diagnostics Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command, added DMTEST feature"/>
+    <revision revision="3" summary="Added DeviceLoadStatus attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0033" name="General Diagnostics"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <features>
+    <feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
+      <describedConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="BootReasonEnum">
+      <item value="0" name="Unspecified" summary="The Node is unable to identify the Power-On reason as one of the other provided enumeration values.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="PowerOnReboot" summary="The Node has booted as the result of physical interaction with the device resulting in a reboot.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BrownOutReset" summary="The Node has rebooted as the result of a brown-out of the Node&apos;s power supply.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="SoftwareWatchdogReset" summary="The Node has rebooted as the result of a software watchdog timer.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="HardwareWatchdogReset" summary="The Node has rebooted as the result of a hardware watchdog timer.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="SoftwareUpdateCompleted" summary="The Node has rebooted as the result of a completed software update.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="SoftwareReset" summary="The Node has rebooted as the result of a software initiated reboot.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="HardwareFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Radio" summary="The Node has encountered a fault with at least one of its radios.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Sensor" summary="The Node has encountered a fault with at least one of its sensors.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ResettableOverTemp" summary="The Node has encountered an over-temperature fault that is resettable.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NonResettableOverTemp" summary="The Node has encountered an over-temperature fault that is not resettable.">
+        <optionalConform/>
+      </item>
+      <item value="5" name="PowerSource" summary="The Node has encountered a fault with at least one of its power sources.">
+        <optionalConform/>
+      </item>
+      <item value="6" name="VisualDisplayFault" summary="The Node has encountered a fault with at least one of its visual displays.">
+        <optionalConform/>
+      </item>
+      <item value="7" name="AudioOutputFault" summary="The Node has encountered a fault with at least one of its audio outputs.">
+        <optionalConform/>
+      </item>
+      <item value="8" name="UserInterfaceFault" summary="The Node has encountered a fault with at least one of its user interfaces.">
+        <optionalConform/>
+      </item>
+      <item value="9" name="NonVolatileMemoryError" summary="The Node has encountered a fault with its non-volatile memory.">
+        <optionalConform/>
+      </item>
+      <item value="10" name="TamperDetected" summary="The Node has encountered disallowed physical tampering.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="InterfaceTypeEnum">
+      <item value="0" name="Unspecified" summary="Indicates an interface of an unspecified type.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="WiFi" summary="Indicates a Wi-Fi interface.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Ethernet" summary="Indicates a Ethernet interface.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Cellular" summary="Indicates a Cellular interface.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Thread" summary="Indicates a Thread interface.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="NetworkFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="HardwareFailure" summary="The Node has encountered a network fault as a result of a hardware failure.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="NetworkJammed" summary="The Node has encountered a network fault as a result of a jammed network.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ConnectionFailed" summary="The Node has encountered a network fault as a result of a failure to establish a connection.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="RadioFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified radio fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="WiFiFault" summary="The Node has encountered a fault with its Wi-Fi radio.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="CellularFault" summary="The Node has encountered a fault with its cellular radio.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ThreadFault" summary="The Node has encountered a fault with its 802.15.4 radio.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NFCFault" summary="The Node has encountered a fault with its NFC radio.">
+        <optionalConform/>
+      </item>
+      <item value="5" name="BLEFault" summary="The Node has encountered a fault with its BLE radio.">
+        <optionalConform/>
+      </item>
+      <item value="6" name="EthernetFault" summary="The Node has encountered a fault with its Ethernet controller.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <struct name="DeviceLoadStruct">
+      <field id="0" name="CurrentSubscriptions" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CurrentSubscriptionsForFabric" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TotalSubscriptionsEstablished" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TotalInteractionModelMessagesSent" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="TotalInteractionModelMessagesReceived" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="NetworkInterface">
+      <field id="0" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="IsOperational" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OffPremiseServicesReachableIPv4" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OffPremiseServicesReachableIPv6" type="bool" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="HardwareAddress" type="hwadr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="6"/>
+        </constraint>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+      </field>
+      <field id="5" name="IPv4Addresses" type="list">
+        <entry type="ipv4adr"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+      <field id="6" name="IPv6Addresses" type="list">
+        <entry type="ipv6adr"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+      <field id="7" name="Type" type="InterfaceTypeEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NetworkInterfaces" type="list">
+      <entry type="NetworkInterface"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="RebootCount" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="UpTime" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="TotalOperationalHours" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="BootReason" type="BootReasonEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="ActiveHardwareFaults" type="list">
+      <entry type="HardwareFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxCount value="11"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="ActiveRadioFaults" type="list">
+      <entry type="RadioFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxCount value="7"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="ActiveNetworkFaults" type="list">
+      <entry type="NetworkFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxCount value="4"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="TestEventTriggersEnabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0009" name="DoNotUse">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x000A" name="DeviceLoadStatus" type="DeviceLoadStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="3"/>
+        </greaterOrEqualTerm>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="TestEventTrigger" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="EnableKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="EventTrigger" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="TimeSnapshot" direction="commandToServer" response="TimeSnapshotResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="TimeSnapshotResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="SystemTimeMs" type="systime-ms" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PosixTimeMs" type="posix-ms" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="PayloadTestRequest" direction="commandToServer" response="PayloadTestResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="DMTEST"/>
+      </mandatoryConform>
+      <field id="0" name="EnableKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="Value" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Count" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="2048"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="PayloadTestResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="DMTEST"/>
+      </mandatoryConform>
+      <field id="0" name="Payload" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="2048"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="HardwareFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="list">
+        <entry type="HardwareFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="11"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list">
+        <entry type="HardwareFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="11"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x01" name="RadioFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="list">
+        <entry type="RadioFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="7"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list">
+        <entry type="RadioFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="7"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x02" name="NetworkFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="list">
+        <entry type="NetworkFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list">
+        <entry type="NetworkFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="BootReason" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="BootReason" type="BootReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticsSoftware.xml b/data_model/1.6/clusters/DiagnosticsSoftware.xml
new file mode 100644
index 00000000000..e5331844a66
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticsSoftware.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0034" name="Software Diagnostics Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0034" name="Software Diagnostics"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DGSW" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <features>
+    <feature bit="0" code="WTRMRK" name="Watermarks" summary="Node makes available the metrics for high watermark related to memory consumption.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ThreadMetricsStruct">
+      <field id="0" name="ID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8"/>
+        </constraint>
+      </field>
+      <field id="2" name="StackFreeCurrent" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="3" name="StackFreeMinimum" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="4" name="StackSize" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ThreadMetrics" type="list">
+      <entry type="ThreadMetricsStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <maxCount value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentHeapFree" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="CurrentHeapUsed" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="CurrentHeapHighWatermark" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="WTRMRK"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetWatermarks" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="WTRMRK"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="SoftwareFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ID" type="uint64" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="8"/>
+        </constraint>
+      </field>
+      <field id="2" name="FaultRecording" type="octstr" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="1024"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticsThread.xml b/data_model/1.6/clusters/DiagnosticsThread.xml
new file mode 100644
index 00000000000..c14db197e1c
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticsThread.xml
@@ -0,0 +1,768 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0035" name="Thread Network Diagnostics Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Remove optionality from FrameErrorRate and MessageErrorRate"/>
+    <revision revision="3" summary="Add ExtAddress and Rloc16 attributes"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0035" name="Thread Network Diagnostics"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DGTHREAD" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Server supports the counts for the number of received and transmitted packets on the Thread interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Server supports the counts for the number of errors that have occurred during the reception and transmission of packets on the Thread interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="MLECNT" name="MLECounts" summary="Server supports the counts for various MLE layer happenings.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="MACCNT" name="MACCounts" summary="Server supports the counts for various MAC layer happenings.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ConnectionStatusEnum">
+      <item value="0" name="Connected" summary="Node is connected">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotConnected" summary="Node is not connected">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="NetworkFaultEnum">
+      <item value="0" name="Unspecified" summary="Indicates an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LinkDown" summary="Indicates the Thread link is down.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="HardwareFailure" summary="Indicates there has been Thread hardware failure.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NetworkJammed" summary="Indicates the Thread network is jammed.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="RoutingRoleEnum">
+      <item value="0" name="Unspecified" summary="Unspecified routing role.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Unassigned" summary="The Node does not currently have a role as a result of the Thread interface not currently being configured or operational.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SleepyEndDevice" summary="The Node acts as a Sleepy End Device with RX-off-when-idle sleepy radio behavior.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EndDevice" summary="The Node acts as an End Device without RX-off-when-idle sleepy radio behavior.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="REED" summary="The Node acts as an Router Eligible End Device.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Router" summary="The Node acts as a Router Device.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Leader" summary="The Node acts as a Leader Device.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="NeighborTableStruct">
+      <field id="0" name="ExtAddress" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Age" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Rloc16" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LinkFrameCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="MleFrameCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="LQI" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="255"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="6" name="AverageRssi" type="int8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-128"/>
+            <to value="0"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="7" name="LastRssi" type="int8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-128"/>
+            <to value="0"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="8" name="FrameErrorRate" type="uint8" default="0">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="9" name="MessageErrorRate" type="uint8" default="0">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="10" name="RxOnWhenIdle" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="11" name="FullThreadDevice" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="12" name="FullNetworkData" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="13" name="IsChild" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="OperationalDatasetComponents">
+      <field id="0" name="ActiveTimestampPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PendingTimestampPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MasterKeyPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="NetworkNamePresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="ExtendedPanIdPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MeshLocalPrefixPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="DelayPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="PanIdPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="ChannelPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="PskcPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="10" name="SecurityPolicyPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="11" name="ChannelMaskPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="RouteTableStruct">
+      <field id="0" name="ExtAddress" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Rloc16" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="RouterId" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="NextHop" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="PathCost" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="LQIIn" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="LQIOut" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Age" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="Allocated" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="LinkEstablished" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="SecurityPolicy">
+      <field id="0" name="RotationTime" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Flags" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Channel" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="RoutingRole" type="RoutingRoleEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="NetworkName" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="PanId" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="ExtendedPanId" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="MeshLocalPrefix" type="ipv6pre">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="17"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="NeighborTable" type="list" default="empty">
+      <entry type="NeighborTableStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="RouteTable" type="list" default="empty">
+      <entry type="RouteTableStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0009" name="PartitionId" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000A" name="Weighting" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="DataVersion" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="StableDataVersion" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000D" name="LeaderRouterId" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="62"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="DetachedRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000F" name="ChildRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0010" name="RouterRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0011" name="LeaderRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0012" name="AttachAttemptCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0013" name="PartitionIdChangeCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0014" name="BetterPartitionAttachAttemptCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0015" name="ParentChangeCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0016" name="TxTotalCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0017" name="TxUnicastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0018" name="TxBroadcastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0019" name="TxAckRequestedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001A" name="TxAckedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001B" name="TxNoAckRequestedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001C" name="TxDataCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001D" name="TxDataPollCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001E" name="TxBeaconCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001F" name="TxBeaconRequestCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0020" name="TxOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0021" name="TxRetryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0022" name="TxDirectMaxRetryExpiryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0023" name="TxIndirectMaxRetryExpiryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0024" name="TxErrCcaCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0025" name="TxErrAbortCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0026" name="TxErrBusyChannelCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0027" name="RxTotalCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0028" name="RxUnicastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0029" name="RxBroadcastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002A" name="RxDataCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002B" name="RxDataPollCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002C" name="RxBeaconCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002D" name="RxBeaconRequestCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002E" name="RxOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002F" name="RxAddressFilteredCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0030" name="RxDestAddrFilteredCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0031" name="RxDuplicatedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0032" name="RxErrNoFrameCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0033" name="RxErrUnknownNeighborCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0034" name="RxErrInvalidSrcAddrCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0035" name="RxErrSecCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0036" name="RxErrFcsCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0037" name="RxErrOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0038" name="ActiveTimestamp" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0039" name="PendingTimestamp" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003A" name="Delay" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003B" name="SecurityPolicy" type="SecurityPolicy">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x003C" name="ChannelPage0Mask" type="octstr">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="4"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x003D" name="OperationalDatasetComponents" type="OperationalDatasetComponents">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x003E" name="ActiveNetworkFaultsList" type="list">
+      <entry type="NetworkFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="4"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x003F" name="ExtAddress" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0040" name="Rloc16" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ConnectionStatus" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ConnectionStatus" type="ConnectionStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="NetworkFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="list">
+        <entry type="NetworkFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list">
+        <entry type="NetworkFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/DiagnosticsWiFi.xml b/data_model/1.6/clusters/DiagnosticsWiFi.xml
new file mode 100644
index 00000000000..71b69525b88
--- /dev/null
+++ b/data_model/1.6/clusters/DiagnosticsWiFi.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="Wi-Fi Network Diagnostics Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0036" name="Wi-Fi Network Diagnostics"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="DGWIFI" scope="Node">
+    <quality diagnostics="true"/>
+  </classification>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Node makes available the counts for the number of received and transmitted packets on the Wi-Fi interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Node makes available the counts for the number of errors that have occurred during the reception and transmission of packets on the Wi-Fi interface.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AssociationFailureCauseEnum">
+      <item value="0" name="Unknown" summary="The reason for the failure is unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AssociationFailed" summary="An error occurred during association.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AuthenticationFailed" summary="An error occurred during authentication.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="SsidNotFound" summary="The specified SSID could not be found.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ConnectionStatusEnum">
+      <item value="0" name="Connected" summary="Indicate the node is connected">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotConnected" summary="Indicate the node is not connected">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SecurityTypeEnum">
+      <item value="0" name="Unspecified" summary="Indicate the usage of an unspecified Wi-Fi security type">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="None" summary="Indicate the usage of no Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="WEP" summary="Indicate the usage of WEP Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WPA" summary="Indicate the usage of WPA Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="WPA2" summary="Indicate the usage of WPA2 Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="WPA3" summary="Indicate the usage of WPA3 Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiFiVersionEnum">
+      <item value="0" name="a" summary="Indicate the network interface is currently using IEEE 802.11a against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="b" summary="Indicate the network interface is currently using IEEE 802.11b against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="g" summary="Indicate the network interface is currently using IEEE 802.11g against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="n" summary="Indicate the network interface is currently using IEEE 802.11n against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="ac" summary="Indicate the network interface is currently using IEEE 802.11ac against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="ax" summary="Indicate the network interface is currently using IEEE 802.11ax against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="ah" summary="Indicate the network interface is currently using IEEE 802.11ah against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="BSSID" type="octstr" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="6"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SecurityType" type="SecurityTypeEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="WiFiVersion" type="WiFiVersionEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="ChannelNumber" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="RSSI" type="int8" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-120"/>
+          <to value="0"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="BeaconLostCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="BeaconRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="PacketMulticastRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="PacketMulticastTxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="PacketUnicastRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="PacketUnicastTxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000B" name="CurrentMaxRate" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000C" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="Disconnection" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ReasonCode" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="AssociationFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="AssociationFailureCause" type="AssociationFailureCauseEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Status" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="ConnectionStatus" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ConnectionStatus" type="ConnectionStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/DishwasherAlarm.xml b/data_model/1.6/clusters/DishwasherAlarm.xml
new file mode 100644
index 00000000000..0df7564b04a
--- /dev/null
+++ b/data_model/1.6/clusters/DishwasherAlarm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005D" name="Dishwasher Alarm Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005D" name="Dishwasher Alarm"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Alarm Base" role="application" picsCode="DISHALM" scope="Endpoint"/>
+  <dataTypes>
+    <bitmap name="AlarmBitmap">
+      <bitfield name="InflowError" bit="0" summary="Water inflow is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="DrainError" bit="1" summary="Water draining is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="DoorError" bit="2" summary="Door or door lock is abnormal">
+        <optionalConform choice="a" more="true" min="1"/>
+      </bitfield>
+      <bitfield name="TempTooLow" bit="3" summary="Unable to reach normal temperature">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="TempTooHigh" bit="4" summary="Temperature is too high">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="WaterLevelError" bit="5" summary="Water level is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+</cluster>
diff --git a/data_model/1.6/clusters/DoorLock.xml b/data_model/1.6/clusters/DoorLock.xml
new file mode 100644
index 00000000000..f8353b20d18
--- /dev/null
+++ b/data_model/1.6/clusters/DoorLock.xml
@@ -0,0 +1,2118 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock Cluster" revision="10">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1811 1812 1821"/>
+    <revision revision="2" summary="CCB 2430"/>
+    <revision revision="3" summary="CCB 2629 2630"/>
+    <revision revision="4" summary="All Hubs changes and added feature map"/>
+    <revision revision="5" summary="CCB 3472 3474 3338"/>
+    <revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
+    <revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
+    <revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes. and added support for Aliro credential provisioning"/>
+    <revision revision="9" summary="Removed AlarmMask attribute"/>
+    <revision revision="10" summary="Removed Zigbee related elements and P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0101" name="Door Lock"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="DRLK" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PIN" name="PINCredential" summary="Lock supports PIN credentials (via keypad, or over-the-air)">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="RID" name="RFIDCredential" summary="Lock supports RFID credentials">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="FGP" name="FingerCredentials" summary="Lock supports finger related credentials (fingerprint, finger vein)">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="4" code="WDSCH" name="WeekDayAccessSchedules" summary="Lock supports week day user access schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="DPS" name="DoorPositionSensor" summary="Lock supports a door position sensor that indicates door&apos;s state">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="FACE" name="FaceCredentials" summary="Lock supports face related credentials (face, iris, retina)">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="7" code="COTA" name="CredentialOverTheAirAccess" summary="PIN codes over-the-air supported for lock/unlock operations">
+      <optionalConform/>
+    </feature>
+    <feature bit="8" code="USR" name="User" summary="Lock supports the user commands and database">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+          <feature name="FGP"/>
+          <feature name="FACE"/>
+          <feature name="ALIRO"/>
+        </orTerm>
+      </mandatoryConform>
+    </feature>
+    <feature bit="10" code="YDSCH" name="YearDayAccessSchedules" summary="Lock supports year day user access schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="11" code="HDSCH" name="HolidaySchedules" summary="Lock supports holiday schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
+      <optionalConform/>
+    </feature>
+    <feature bit="13" code="ALIRO" name="AliroProvisioning" summary="Lock supports Aliro credential provisioning as defined in Aliro">
+      <optionalConform/>
+    </feature>
+    <feature bit="14" code="ALBU" name="AliroBLEUWB" summary="Lock supports the Bluetooth LE + UWB Access Control Flow as defined in Aliro">
+      <optionalConform>
+        <feature name="ALIRO"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AlarmCodeEnum">
+      <item value="0" name="LockJammed" summary="Locking Mechanism Jammed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LockFactoryReset" summary="Lock Reset to Factory Defaults">
+        <optionalConform/>
+      </item>
+      <item value="3" name="LockRadioPowerCycled" summary="Lock Radio Power Cycled">
+        <optionalConform/>
+      </item>
+      <item value="4" name="WrongCodeEntryLimit" summary="Tamper Alarm - wrong code entry limit">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="FrontEsceutcheonRemoved" summary="Tamper Alarm - front escutcheon removed from main">
+        <optionalConform/>
+      </item>
+      <item value="6" name="DoorForcedOpen" summary="Forced Door Open under Door Locked Condition">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="DoorAjar" summary="Door ajar">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="8" name="ForcedUser" summary="Force User SOS alarm">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="CredentialRuleEnum">
+      <item value="0" name="Single" summary="Only one credential is required for lock operation">
+        <mandatoryConform>
+          <feature name="USR"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Dual" summary="Any two credentials are required for lock operation">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="Tri" summary="Any three credentials are required for lock operation">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="CredentialTypeEnum">
+      <item value="0" name="ProgrammingPIN" summary="Programming PIN code credential type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="PIN" summary="PIN code credential type">
+        <mandatoryConform>
+          <feature name="PIN"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="RFID" summary="RFID identifier credential type">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Fingerprint" summary="Fingerprint identifier credential type">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="FingerVein" summary="Finger vein identifier credential type">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="Face" summary="Face identifier credential type">
+        <mandatoryConform>
+          <feature name="FACE"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="AliroCredentialIssuerKey" summary="A Credential Issuer public key as defined in Aliro">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="AliroEvictableEndpointKey" summary="An Endpoint public key as defined in Aliro which can be evicted if space is needed for another endpoint key">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="AliroNonEvictableEndpointKey" summary="An Endpoint public key as defined in Aliro which cannot be evicted if space is needed for another endpoint key">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="DataOperationTypeEnum">
+      <item value="0" name="Add" summary="Data is being added or was added">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Clear" summary="Data is being cleared or was cleared">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Modify" summary="Data is being modified or was modified">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DoorStateEnum">
+      <item value="0" name="DoorOpen" summary="Door state is open">
+        <mandatoryConform>
+          <feature name="DPS"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="DoorClosed" summary="Door state is closed">
+        <mandatoryConform>
+          <feature name="DPS"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="DoorJammed" summary="Door state is jammed">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="DoorForcedOpen" summary="Door state is currently forced open">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="DoorUnspecifiedError" summary="Door state is invalid for unspecified reason">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="DoorAjar" summary="Door state is ajar">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="EventTypeEnum">
+      <item value="0" name="Operation" summary="Event type is operation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Programming" summary="Event type is programming">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Alarm" summary="Event type is alarm">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LEDSettingEnum">
+      <item value="0" name="NoLEDSignal" summary="Never use LED for signalization">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NoLEDSignalAccessAllowed" summary="Use LED signalization except for access allowed events">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="LEDSignalAll" summary="Use LED signalization for all events">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LockDataTypeEnum">
+      <item value="0" name="Unspecified" summary="Unspecified or manufacturer specific lock user data added, cleared, or modified.">
+        <optionalConform/>
+      </item>
+      <item value="1" name="ProgrammingCode" summary="Lock programming PIN code was added, cleared, or modified.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="UserIndex" summary="Lock user index was added, cleared, or modified.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WeekDaySchedule" summary="Lock user week day schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="WDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="YearDaySchedule" summary="Lock user year day schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="YDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="HolidaySchedule" summary="Lock holiday schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="HDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="PIN" summary="Lock user PIN code was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="PIN"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="RFID" summary="Lock user RFID code was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="Fingerprint" summary="Lock user fingerprint was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="FingerVein" summary="Lock user finger-vein information was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="10" name="Face" summary="Lock user face information was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FACE"/>
+        </mandatoryConform>
+      </item>
+      <item value="11" name="AliroCredentialIssuerKey" summary="An Aliro credential issuer key credential was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+      <item value="12" name="AliroEvictableEndpointKey" summary="An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+      <item value="13" name="AliroNonEvictableEndpointKey" summary="An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="LockOperationTypeEnum">
+      <item value="0" name="Lock" summary="Lock operation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Unlock" summary="Unlock operation">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NonAccessUserEvent" summary="Triggered by keypad entry for user with User Type set to Non Access User">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ForcedUserEvent" summary="Triggered by using a user with UserType set to Forced User">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Unlatch" summary="Unlatch operation">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LockStateEnum">
+      <item value="0" name="NotFullyLocked" summary="Lock state is not fully locked">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Locked" summary="Lock state is fully locked">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Unlocked" summary="Lock state is fully unlocked">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Unlatched" summary="Lock state is fully unlocked and the latch is pulled">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="LockTypeEnum">
+      <item value="0" name="DeadBolt" summary="Physical lock type is dead bolt">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Magnetic" summary="Physical lock type is magnetic">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Other" summary="Physical lock type is other">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Mortise" summary="Physical lock type is mortise">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rim" summary="Physical lock type is rim">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="LatchBolt" summary="Physical lock type is latch bolt">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="CylindricalLock" summary="Physical lock type is cylindrical lock">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="TubularLock" summary="Physical lock type is tubular lock">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="InterconnectedLock" summary="Physical lock type is interconnected lock">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="DeadLatch" summary="Physical lock type is dead latch">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="DoorFurniture" summary="Physical lock type is door furniture">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Eurocylinder" summary="Physical lock type is euro cylinder">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperatingModeEnum">
+      <item value="0" name="Normal">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Vacation">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Privacy">
+        <optionalConform/>
+      </item>
+      <item value="3" name="NoRemoteLockUnlock">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Passage">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="OperationErrorEnum">
+      <item value="0" name="Unspecified" summary="Lock/unlock error caused by unknown or unspecified source">
+        <optionalConform/>
+      </item>
+      <item value="1" name="InvalidCredential" summary="Lock/unlock error caused by invalid PIN, RFID, fingerprint or other credential">
+        <mandatoryConform>
+          <feature name="USR"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="DisabledUserDenied" summary="Lock/unlock error caused by disabled USER or credential">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Restricted" summary="Lock/unlock error caused by schedule restriction">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="WDSCH"/>
+            <feature name="YDSCH"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="InsufficientBattery" summary="Lock/unlock error caused by insufficient battery power left to safely actuate the lock">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="OperationSourceEnum">
+      <item value="0" name="Unspecified" summary="Lock/unlock operation came from unspecified source">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Manual" summary="Lock/unlock operation came from manual operation (key, thumbturn, handle, etc).">
+        <optionalConform/>
+      </item>
+      <item value="2" name="ProprietaryRemote" summary="Lock/unlock operation came from proprietary remote source (e.g. vendor app/cloud)">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Keypad" summary="Lock/unlock operation came from keypad">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Auto" summary="Lock/unlock operation came from lock automatically (e.g. relock timer)">
+        <optionalConform/>
+      </item>
+      <item value="5" name="Button" summary="Lock/unlock operation came from lock button (e.g. one touch or button)">
+        <optionalConform/>
+      </item>
+      <item value="6" name="Schedule" summary="Lock/unlock operation came from lock due to a schedule">
+        <mandatoryConform>
+          <feature name="HDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="Remote" summary="Lock/unlock operation came from remote node">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="RFID" summary="Lock/unlock operation came from RFID card">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="Biometric" summary="Lock/unlock operation came from biometric source (e.g. face, fingerprint/fingervein)">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="10" name="Aliro" summary="Lock/unlock operation came from an interaction defined in Aliro, or user change operation was a step-up credential provisioning as defined in Aliro">
+        <mandatoryConform>
+          <feature name="ALIRO"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="SoundVolumeEnum">
+      <item value="0" name="Silent" summary="Silent Mode">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Low Volume">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="High" summary="High Volume">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Medium" summary="Medium Volume">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="DUPLICATE" summary="Entry would cause a duplicate credential/ID.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="OCCUPIED" summary="Entry would replace an occupied slot.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="UserStatusEnum">
+      <item value="0" name="Available" summary="The user ID is available">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OccupiedEnabled" summary="The user ID is occupied and enabled">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OccupiedDisabled" summary="The user ID is occupied and disabled">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="UserTypeEnum">
+      <item value="0" name="UnrestrictedUser" summary="The user ID type is unrestricted">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="YearDayScheduleUser" summary="The user ID type is schedule">
+        <optionalConform/>
+      </item>
+      <item value="2" name="WeekDayScheduleUser" summary="The user ID type is schedule">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ProgrammingUser" summary="The user ID type is programming">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NonAccessUser" summary="The user ID type is non access">
+        <optionalConform/>
+      </item>
+      <item value="5" name="ForcedUser" summary="The user ID type is forced">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="6" name="DisposableUser" summary="The user ID type is disposable">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="ExpiringUser" summary="The user ID type is expiring">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="8" name="ScheduleRestrictedUser" summary="The user ID type is schedule restricted">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="WDSCH"/>
+            <feature name="YDSCH"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="RemoteOnlyUser" summary="The user ID type is remote only">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="USR"/>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="AlarmMaskBitmap">
+      <bitfield name="LockJammed" bit="0" summary="Locking Mechanism Jammed">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="WrongCodeEntryLimit" bit="4" summary="Tamper Alarm - wrong code entry limit">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="PIN"/>
+            <feature name="RID"/>
+          </orTerm>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="FrontEscutcheonRemoved" bit="5" summary="Tamper Alarm - front escutcheon removed from main">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="DoorForcedOpen" bit="6" summary="Forced Door Open under Door Locked Condition">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ConfigurationRegisterBitmap">
+      <bitfield name="LocalProgramming" bit="0" summary="The state of local programming functionality">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="KeypadInterface" bit="1" summary="The state of the keypad interface">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemoteInterface" bit="2" summary="The state of the remote interface">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SoundVolume" bit="5" summary="Sound volume is set to Silent value">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AutoRelockTime" bit="6" summary="Auto relock time it set to 0">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LEDSettings" bit="7" summary="LEDs is disabled">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="CredentialRulesBitmap">
+      <bitfield name="Single" bit="0" summary="Only one credential is required for lock operation">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Dual" bit="1" summary="Any two credentials are required for lock operation">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tri" bit="2" summary="Any three credentials are required for lock operation">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="DaysMaskBitmap">
+      <bitfield name="Sunday" bit="0" summary="Schedule is applied on Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Schedule is applied on Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Schedule is applied on Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Schedule is applied on Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Schedule is applied on Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Schedule is applied on Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Schedule is applied on Saturday">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="LocalProgrammingFeaturesBitmap">
+      <bitfield name="AddUsersCredentialsSchedules" bit="0" summary="The state of the ability to add users, credentials or schedules on the device">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ModifyUsersCredentialsSchedules" bit="1" summary="The state of the ability to modify users, credentials or schedules on the device">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ClearUsersCredentialsSchedules" bit="2" summary="The state of the ability to clear users, credentials or schedules on the device">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AdjustSettings" bit="3" summary="The state of the ability to adjust settings on the device">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OperatingModesBitmap">
+      <bitfield name="Normal" bit="0" summary="Normal operation mode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Vacation" bit="1" summary="Vacation operation mode">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="Privacy" bit="2" summary="Privacy operation mode">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="NoRemoteLockUnlock" bit="3" summary="No remote lock and unlock operation mode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Passage" bit="4" summary="Passage operation mode">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="CredentialStruct">
+      <field id="0" name="CredentialType" type="CredentialTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CredentialIndex" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LockState" type="LockStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="LockType" type="LockTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ActuatorEnabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="DoorState" type="DoorStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="DPS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="DoorOpenEvents" type="uint32">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0005" name="DoorClosedEvents" type="uint32">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0006" name="OpenPeriod" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0011" name="NumberOfTotalUsersSupported" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0012" name="NumberOfPINUsersSupported" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0013" name="NumberOfRFIDUsersSupported" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0014" name="NumberOfWeekDaySchedulesSupportedPerUser" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="0xFD"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0015" name="NumberOfYearDaySchedulesSupportedPerUser" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="0xFD"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="NumberOfHolidaySchedulesSupported" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="0xFD"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0017" name="MaxPINCodeLength" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0018" name="MinPINCodeLength" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0019" name="MaxRFIDCodeLength" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001A" name="MinRFIDCodeLength" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001B" name="CredentialRulesSupport" type="CredentialRulesBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001C" name="NumberOfCredentialsSupportedPerUser" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0021" name="Language" type="string" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="3"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0022" name="LEDSettings" type="LEDSettingEnum" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0023" name="AutoRelockTime" type="uint32" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0024" name="SoundVolume" type="SoundVolumeEnum" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0025" name="OperatingMode" type="OperatingModeEnum">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0026" name="SupportedOperatingModes" type="OperatingModesBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0027" name="DefaultConfigurationRegister" type="ConfigurationRegisterBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0028" name="EnableLocalProgramming" type="bool" default="true">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0029" name="EnableOneTouchLocking" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002A" name="EnableInsideStatusLED" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002B" name="EnablePrivacyModeButton" type="bool" default="false">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002C" name="LocalProgrammingFeatures" type="LocalProgrammingFeaturesBitmap" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0030" name="WrongCodeEntryLimit" type="uint8">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="255"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0031" name="UserCodeTemporaryDisableTime" type="uint8">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="255"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0032" name="SendPINOverTheAir" type="bool" default="false">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <optionalConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0033" name="RequirePINforRemoteOperation" type="bool">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="COTA"/>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0034" name="SecurityLevel" default="0">
+      <access read="true" readPrivilege="view"/>
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0035" name="ExpiringUserTimeout" type="uint16" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <optionalConform>
+        <feature name="USR"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="2880"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0080" name="AliroReaderVerificationKey" type="octstr">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+      <constraint>
+        <allowed value="65"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0081" name="AliroReaderGroupIdentifier" type="octstr">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+      <constraint>
+        <allowed value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0082" name="AliroReaderGroupSubIdentifier" type="octstr">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+      <constraint>
+        <allowed value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0083" name="AliroExpeditedTransactionSupportedProtocolVersions" type="list">
+      <entry type="octstr">
+        <constraint>
+          <allowed value="2"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0084" name="AliroGroupResolvingKey" type="octstr">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="ALBU"/>
+      </mandatoryConform>
+      <constraint>
+        <allowed value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0085" name="AliroSupportedBLEUWBProtocolVersions" type="list">
+      <entry type="octstr">
+        <constraint>
+          <allowed value="2"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALBU"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0086" name="AliroBLEAdvertisingVersion" type="uint8">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALBU"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0087" name="NumberOfAliroCredentialIssuerKeysSupported" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0088" name="NumberOfAliroEndpointKeysSupported" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="LockDoor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode" type="octstr">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x01" name="UnlockDoor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode" type="octstr">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x02" name="Toggle" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <disallowConform/>
+    </command>
+    <command id="0x03" name="UnlockWithTimeout" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <optionalConform/>
+      <field id="0" name="Timeout" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PINCode" type="octstr">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x0B" name="SetWeekDaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfWeekDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="DaysMask" type="DaysMaskBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StartHour" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="23"/>
+        </constraint>
+      </field>
+      <field id="4" name="StartMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="59"/>
+        </constraint>
+      </field>
+      <field id="5" name="EndHour" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="23"/>
+        </constraint>
+      </field>
+      <field id="6" name="EndMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="59"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="GetWeekDaySchedule" direction="commandToServer" response="GetWeekDayScheduleResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfWeekDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="GetWeekDayScheduleResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfWeekDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="DaysMask" type="DaysMaskBitmap">
+        <optionalConform/>
+      </field>
+      <field id="4" name="StartHour" type="uint8">
+        <optionalConform/>
+        <constraint>
+          <max value="23"/>
+        </constraint>
+      </field>
+      <field id="5" name="StartMinute" type="uint8">
+        <optionalConform/>
+        <constraint>
+          <max value="59"/>
+        </constraint>
+      </field>
+      <field id="6" name="EndHour" type="uint8">
+        <optionalConform/>
+        <constraint>
+          <max value="23"/>
+        </constraint>
+      </field>
+      <field id="7" name="EndMinute" type="uint8">
+        <optionalConform/>
+        <constraint>
+          <max value="59"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0D" name="ClearWeekDaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfWeekDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+        <constraint>
+          <allowed value="0xFE"/>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0E" name="SetYearDaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfYearDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="LocalStartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LocalEndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0F" name="GetYearDaySchedule" direction="commandToServer" response="GetYearDayScheduleResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfYearDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0F" name="GetYearDayScheduleResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfYearDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="LocalStartTime" type="epoch-s">
+        <optionalConform/>
+      </field>
+      <field id="4" name="LocalEndTime" type="epoch-s">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x10" name="ClearYearDaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfYearDaySchedulesSupportedPerUser"/>
+            </to>
+          </between>
+        </constraint>
+        <constraint>
+          <allowed value="0xFE"/>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x11" name="SetHolidaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfHolidaySchedulesSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="LocalStartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="LocalEndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OperatingMode" type="OperatingModeEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x12" name="GetHolidaySchedule" direction="commandToServer" response="GetHolidayScheduleResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfHolidaySchedulesSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x12" name="GetHolidayScheduleResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfHolidaySchedulesSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="LocalStartTime" type="epoch-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="3" name="LocalEndTime" type="epoch-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="4" name="OperatingMode" type="OperatingModeEnum">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x13" name="ClearHolidaySchedule" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfHolidaySchedulesSupported"/>
+            </to>
+          </between>
+        </constraint>
+        <constraint>
+          <allowed value="0xFE"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x1A" name="SetUser" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="OperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Add"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Modify"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="UserName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="10"/>
+        </constraint>
+      </field>
+      <field id="3" name="UserUniqueID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="UserStatus" type="UserStatusEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="OccupiedEnabled"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="OccupiedDisabled"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="5" name="UserType" type="UserTypeEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="UnrestrictedUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="NonAccessUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ForcedUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="DisposableUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ExpiringUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ScheduleRestrictedUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="RemoteOnlyUser"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="6" name="CredentialRule" type="CredentialRuleEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x1B" name="GetUser" direction="commandToServer" response="GetUserResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x1C" name="GetUserResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="UserName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="10"/>
+        </constraint>
+      </field>
+      <field id="2" name="UserUniqueID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="UserStatus" type="UserStatusEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="UserType" type="UserTypeEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="CredentialRule" type="CredentialRuleEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="6" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="0"/>
+            <to>
+              <attribute name="NumberOfCredentialsSupportedPerUser"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="7" name="CreatorFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="LastModifiedFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="NextUserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x1D" name="ClearUser" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+        <constraint>
+          <allowed value="0xFFFE"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x22" name="SetCredential" direction="commandToServer" response="SetCredentialResponse">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="OperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Add"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Modify"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="1" name="Credential" type="CredentialStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="CredentialData" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="UserStatus" type="UserStatusEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="OccupiedEnabled"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="OccupiedDisabled"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="5" name="UserType" type="UserTypeEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="UnrestrictedUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ProgrammingUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="NonAccessUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ForcedUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="DisposableUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="ExpiringUser"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="RemoteOnlyUser"/>
+          </allowed>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x23" name="SetCredentialResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="NextCredentialIndex" type="uint16">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x24" name="GetCredentialStatus" direction="commandToServer" response="GetCredentialStatusResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Credential" type="CredentialStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x25" name="GetCredentialStatusResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="CredentialExists" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfTotalUsersSupported"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="CreatorFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LastModifiedFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="NextCredentialIndex" type="uint16">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="CredentialData" type="octstr">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="ALIRO"/>
+        </optionalConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x26" name="ClearCredential" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Credential" type="CredentialStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x27" name="UnboltDoor" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="UBOLT"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="octstr">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x28" name="SetAliroReaderConfig" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+      <field id="0" name="SigningKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="VerificationKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="65"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupIdentifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="GroupResolvingKey" type="octstr">
+        <mandatoryConform>
+          <feature name="ALBU"/>
+        </mandatoryConform>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x29" name="ClearAliroReaderConfig" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="ALIRO"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="DoorLockAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="AlarmCode" type="AlarmCodeEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="DoorStateChange" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="DPS"/>
+      </mandatoryConform>
+      <field id="0" name="DoorState" type="DoorStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="LockOperation" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="LockOperationType" type="LockOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfCredentialsSupportedPerUser"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="LockOperationError" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="LockOperationType" type="LockOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OperationError" type="OperationErrorEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfCredentialsSupportedPerUser"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x04" name="LockUserChange" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="LockDataType" type="LockDataTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DataOperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Aliro"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Unspecified"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Keypad"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Remote"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="DataIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/EcosystemInformationCluster.xml b/data_model/1.6/clusters/EcosystemInformationCluster.xml
new file mode 100644
index 00000000000..8a2e5e934a0
--- /dev/null
+++ b/data_model/1.6/clusters/EcosystemInformationCluster.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0750" name="Ecosystem Information Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0750" name="Ecosystem Information"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="ECOINFO" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="DeviceTypeStruct">
+      <field id="0" name="DeviceType" type="devtype-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Revision" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="EcosystemDeviceStruct">
+      <field id="0" name="DeviceName" type="string" default="empty">
+        <access fabricSensitive="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="1" name="DeviceNameLastEdit" type="epoch-us" default="0">
+        <access fabricSensitive="true"/>
+        <mandatoryConform>
+          <field name="DeviceName"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="BridgedEndpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
+        <describedConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OriginalEndpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
+        <describedConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="DeviceTypes" type="list">
+        <entry type="DeviceTypeStruct"/>
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="UniqueLocationIDs" type="list">
+        <entry type="string">
+          <constraint>
+            <maxLength value="64"/>
+          </constraint>
+        </entry>
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="64"/>
+        </constraint>
+      </field>
+      <field id="6" name="UniqueLocationIDsLastEdit" type="epoch-us" default="0">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="EcosystemLocationStruct">
+      <field id="0" name="UniqueLocationID" type="string">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="1" name="LocationDescriptor" type="LocationDescriptorStruct">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="LocationDescriptorLastEdit" type="epoch-us" default="0">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceDirectory" type="list">
+      <entry type="EcosystemDeviceStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="LocationDirectory" type="list">
+      <entry type="EcosystemLocationStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ElectricalEnergyMeasurement.xml b/data_model/1.6/clusters/ElectricalEnergyMeasurement.xml
new file mode 100644
index 00000000000..5a6f1707e25
--- /dev/null
+++ b/data_model/1.6/clusters/ElectricalEnergyMeasurement.xml
@@ -0,0 +1,467 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0091" name="Electrical Energy Measurement Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added support for apparent and reactive energy measurement"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0091" name="Electrical Energy Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EEM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="IMPE" name="ImportedEnergy" summary="Measurement of energy imported by the server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="EXPE" name="ExportedEnergy" summary="Measurement of energy provided by the server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="CUME" name="CumulativeEnergy" summary="Measurements are cumulative">
+      <optionalConform choice="b" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="PERE" name="PeriodicEnergy" summary="Measurements are periodic">
+      <optionalConform choice="b" more="true" min="1"/>
+    </feature>
+    <feature bit="4" code="APPE" name="ApparentEnergy" summary="Measurements report apparent energy">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="5" code="REAE" name="ReactiveEnergy" summary="Measurements report reactive energy">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MeasurementTypeEnum">
+      <item value="0" name="Unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Voltage" summary="Voltage in millivolts (mV)">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ActiveCurrent" summary="Active current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ReactiveCurrent" summary="Reactive current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="ApparentCurrent" summary="Apparent current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="ActivePower" summary="Active power in milliwatts (mW)">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="ReactivePower" summary="Reactive power in millivolt-amps reactive (mVAR)">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="ApparentPower" summary="Apparent power in millivolt-amps (mVA)">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="RMSVoltage" summary="Root mean squared voltage in millivolts (mV)">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="RMSCurrent" summary="Root mean squared current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="RMSPower" summary="Root mean squared power in milliwatts (mW)">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Frequency" summary="AC frequency in millihertz (mHz)">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="PowerFactor" summary="Power Factor ratio in +/- 1/100ths of a percent.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="NeutralCurrent" summary="AC neutral current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="ElectricalEnergy" summary="Electrical energy in milliwatt-hours (mWh)">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="ReactiveEnergy" summary="Reactive power in millivolt-amp-hours reactive (mVARh)">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="ApparentEnergy" summary="Apparent power in millivolt-amp-hours (mVAh)">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="CumulativeEnergyResetStruct">
+      <field id="0" name="ImportedResetTimestamp" type="epoch-s" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="IMPE"/>
+        </optionalConform>
+      </field>
+      <field id="1" name="ExportedResetTimestamp" type="epoch-s" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="EXPE"/>
+        </optionalConform>
+      </field>
+      <field id="2" name="ImportedResetSystime" type="systime-ms" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="IMPE"/>
+        </optionalConform>
+      </field>
+      <field id="3" name="ExportedResetSystime" type="systime-ms" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="EXPE"/>
+        </optionalConform>
+      </field>
+    </struct>
+    <struct name="EnergyMeasurementStruct">
+      <field id="0" name="Energy" type="energy-mWh">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="StartTimestamp" type="epoch-s">
+        <describedConform/>
+      </field>
+      <field id="2" name="EndTimestamp" type="epoch-s">
+        <describedConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="StartTimestamp"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="3" name="StartSystime" type="systime-ms">
+        <describedConform/>
+      </field>
+      <field id="4" name="EndSystime" type="systime-ms">
+        <describedConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="StartSystime"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="5" name="ApparentEnergy" type="energy-mVAh">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <feature name="APPE"/>
+          </mandatoryConform>
+        </otherwiseConform>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="6" name="ReactiveEnergy" type="energy-mVARh">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <feature name="REAE"/>
+          </mandatoryConform>
+        </otherwiseConform>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MeasurementAccuracyRangeStruct">
+      <field id="0" name="RangeMin" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="RangeMax" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="PercentMax" type="percent100ths">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="3" name="PercentMin" type="percent100ths">
+        <optionalConform>
+          <field name="PercentMax"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <field name="PercentTypical"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="4" name="PercentTypical" type="percent100ths">
+        <optionalConform>
+          <field name="PercentMin"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <field name="PercentMin"/>
+            </from>
+            <to>
+              <field name="PercentMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="FixedMax" type="uint64">
+        <optionalConform choice="a" more="true" min="1"/>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left value="4611686018427387904"/>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="6" name="FixedMin" type="uint64">
+        <optionalConform>
+          <field name="FixedMax"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <field name="FixedMax"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="7" name="FixedTypical" type="uint64">
+        <optionalConform>
+          <field name="FixedMin"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <field name="FixedMin"/>
+            </from>
+            <to>
+              <field name="FixedMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MeasurementAccuracyStruct">
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Measured" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinMeasuredValue" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="MaxMeasuredValue" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="AccuracyRanges" type="list">
+        <entry type="MeasurementAccuracyRangeStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Accuracy" type="MeasurementAccuracyStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CumulativeEnergyImported" type="EnergyMeasurementStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="CumulativeEnergyExported" type="EnergyMeasurementStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="PeriodicEnergyImported" type="EnergyMeasurementStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="PeriodicEnergyExported" type="EnergyMeasurementStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="CumulativeEnergyReset" type="CumulativeEnergyResetStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform>
+        <feature name="CUME"/>
+      </optionalConform>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="CumulativeEnergyMeasured" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CUME"/>
+      </mandatoryConform>
+      <field id="0" name="EnergyImported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="CUME"/>
+            <feature name="IMPE"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="EnergyExported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="CUME"/>
+            <feature name="EXPE"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x01" name="PeriodicEnergyMeasured" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PERE"/>
+      </mandatoryConform>
+      <field id="0" name="EnergyImported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="PERE"/>
+            <feature name="IMPE"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="EnergyExported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="PERE"/>
+            <feature name="EXPE"/>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ElectricalGridConditions.xml b/data_model/1.6/clusters/ElectricalGridConditions.xml
new file mode 100644
index 00000000000..11317fc3657
--- /dev/null
+++ b/data_model/1.6/clusters/ElectricalGridConditions.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x00A0" name="Electrical Grid Conditions Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Matter revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x00A0" name="Electrical Grid Conditions"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EGC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="FORE" name="Forecasting" summary="Forecasts upcoming">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ThreeLevelEnum">
+      <item value="0" name="Low" summary="Low">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Medium" summary="Medium">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="High" summary="High">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ElectricalGridConditionsStruct">
+      <field id="0" name="PeriodStart" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="PeriodStart"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="2" name="GridCarbonIntensity" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="GridCarbonLevel" type="ThreeLevelEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="LocalCarbonIntensity" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="LocalCarbonLevel" type="ThreeLevelEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LocalGenerationAvailable" type="bool">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentConditions" type="ElectricalGridConditionsStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ForecastConditions" type="list">
+      <entry type="ElectricalGridConditionsStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FORE"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="56"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="CurrentConditionsChanged" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="CurrentConditions" type="ElectricalGridConditionsStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ElectricalPowerMeasurement.xml b/data_model/1.6/clusters/ElectricalPowerMeasurement.xml
new file mode 100644
index 00000000000..3349108215d
--- /dev/null
+++ b/data_model/1.6/clusters/ElectricalPowerMeasurement.xml
@@ -0,0 +1,645 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0090" name="Electrical Power Measurement Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Changed reactive and apparent power fields to use new data types"/>
+    <revision revision="3" summary="Changed range of apparent current field to allow negative apparent current"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0090" name="Electrical Power Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EPM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DIRC" name="DirectCurrent" summary="Supports measurement of direct current">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="ALTC" name="AlternatingCurrent" summary="Supports measurement of alternating current">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="POLY" name="PolyphasePower" summary="Supports polyphase measurements">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="HARM" name="Harmonics" summary="Supports measurement of AC harmonics">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="PWRQ" name="PowerQuality" summary="Supports measurement of AC harmonic phases">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MeasurementTypeEnum">
+      <item value="0" name="Unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Voltage" summary="Voltage in millivolts (mV)">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ActiveCurrent" summary="Active current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ReactiveCurrent" summary="Reactive current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="ApparentCurrent" summary="Apparent current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="ActivePower" summary="Active power in milliwatts (mW)">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="ReactivePower" summary="Reactive power in millivolt-amps reactive (mVAR)">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="ApparentPower" summary="Apparent power in millivolt-amps (mVA)">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="RMSVoltage" summary="Root mean squared voltage in millivolts (mV)">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="RMSCurrent" summary="Root mean squared current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="RMSPower" summary="Root mean squared power in milliwatts (mW)">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Frequency" summary="AC frequency in millihertz (mHz)">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="PowerFactor" summary="Power Factor ratio in +/- 1/100ths of a percent.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="NeutralCurrent" summary="AC neutral current in milliamps (mA)">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="ElectricalEnergy" summary="Electrical energy in milliwatt-hours (mWh)">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="ReactiveEnergy" summary="Reactive power in millivolt-amp-hours reactive (mVARh)">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="ApparentEnergy" summary="Apparent power in millivolt-amp-hours (mVAh)">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PowerModeEnum">
+      <item value="0" name="Unknown">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DC" summary="Direct current">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AC" summary="Alternating current, either single-phase or polyphase">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="HarmonicMeasurementStruct">
+      <field id="0" name="Order" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="Measurement" type="int64">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MeasurementAccuracyRangeStruct">
+      <field id="0" name="RangeMin" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="RangeMax" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="PercentMax" type="percent100ths">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="3" name="PercentMin" type="percent100ths">
+        <optionalConform>
+          <field name="PercentMax"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <field name="PercentTypical"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="4" name="PercentTypical" type="percent100ths">
+        <optionalConform>
+          <field name="PercentMin"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <field name="PercentMin"/>
+            </from>
+            <to>
+              <field name="PercentMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="FixedMax" type="uint64">
+        <optionalConform choice="a" more="true" min="1"/>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left value="4611686018427387904"/>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="6" name="FixedMin" type="uint64">
+        <optionalConform>
+          <field name="FixedMax"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <field name="FixedMax"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="7" name="FixedTypical" type="uint64">
+        <optionalConform>
+          <field name="FixedMin"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <field name="FixedMin"/>
+            </from>
+            <to>
+              <field name="FixedMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MeasurementAccuracyStruct">
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Measured" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinMeasuredValue" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="MaxMeasuredValue" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="AccuracyRanges" type="list">
+        <entry type="MeasurementAccuracyRangeStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MeasurementRangeStruct">
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Min" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Max" type="int64">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-4611686018427387904"/>
+            <to value="4611686018427387904"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="StartTimestamp" type="epoch-s">
+        <mandatoryConform>
+          <field name="EndTimestamp"/>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="EndTimestamp" type="epoch-s">
+        <describedConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="StartTimestamp"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="5" name="MinTimestamp" type="epoch-s">
+        <mandatoryConform>
+          <field name="EndTimestamp"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="MaxTimestamp" type="epoch-s">
+        <mandatoryConform>
+          <field name="EndTimestamp"/>
+        </mandatoryConform>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="MinTimestamp"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="7" name="StartSystime" type="systime-ms">
+        <mandatoryConform>
+          <field name="EndSystime"/>
+        </mandatoryConform>
+      </field>
+      <field id="8" name="EndSystime" type="systime-ms">
+        <describedConform/>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="StartSystime"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="9" name="MinSystime" type="systime-ms">
+        <mandatoryConform>
+          <field name="EndSystime"/>
+        </mandatoryConform>
+      </field>
+      <field id="10" name="MaxSystime" type="systime-ms">
+        <mandatoryConform>
+          <field name="EndSystime"/>
+        </mandatoryConform>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="MinSystime"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PowerMode" type="PowerModeEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="NumberOfMeasurementTypes" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="Accuracy" type="list">
+      <entry type="MeasurementAccuracyStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to>
+            <attribute name="NumberOfMeasurementTypes"/>
+          </to>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Ranges" type="list" default="empty">
+      <entry type="MeasurementRangeStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality quieterReporting="true"/>
+      <optionalConform/>
+      <constraint>
+        <countBetween>
+          <from value="0"/>
+          <to>
+            <attribute name="NumberOfMeasurementTypes"/>
+          </to>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="Voltage" type="voltage-mV" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="ActiveCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="ReactiveCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="ApparentCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="ActivePower" type="power-mW">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="ReactivePower" type="power-mVAR" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="ApparentPower" type="power-mVA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="RMSVoltage" type="voltage-mV" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="RMSCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000D" name="RMSPower" type="power-mW" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="Frequency" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="1000000"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="HarmonicCurrents" type="list">
+      <entry type="HarmonicMeasurementStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="HARM"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="25"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="HarmonicPhases" type="list">
+      <entry type="HarmonicMeasurementStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="PWRQ"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="25"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0011" name="PowerFactor" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-10000"/>
+          <to value="10000"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="NeutralCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="POLY"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="MeasurementPeriodRanges" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <attribute name="Ranges"/>
+      </mandatoryConform>
+      <field id="0" name="Ranges" type="list">
+        <entry type="MeasurementRangeStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfMeasurementTypes"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/EnergyEVSE.xml b/data_model/1.6/clusters/EnergyEVSE.xml
new file mode 100644
index 00000000000..8951f4228c7
--- /dev/null
+++ b/data_model/1.6/clusters/EnergyEVSE.xml
@@ -0,0 +1,637 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0099" name="Energy EVSE Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Updates after 0.7 Ballot review"/>
+    <revision revision="3" summary="Added Q quality for SessionDuration, SessionEnergyCharged and SessionEnergyDischarged. Updates to V2X and associated areas. Make PREF mandatory."/>
+    <revision revision="4" summary="Sync with SDK revision number"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0099" name="Energy EVSE"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
+      <mandatoryConform/>
+    </feature>
+    <feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="PNC" name="PlugAndCharge" summary="EVSE supports PLC to support Plug and Charge">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="RFID" name="RFID" summary="EVSE is fitted with an RFID reader">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="V2X" name="V2X" summary="EVSE supports bi-directional charging / discharging">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EnergyTransferStoppedReasonEnum">
+      <item value="0" name="EVStopped" summary="The EV decided to stop">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="EVSEStopped" summary="The EVSE decided to stop">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Other" summary="An other unknown reason">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="FaultStateEnum">
+      <item value="0" name="NoError" summary="The EVSE is not in an error state.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MeterFailure" summary="The EVSE is unable to obtain electrical measurements.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="OverVoltage" summary="The EVSE input voltage level is too high.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="UnderVoltage" summary="The EVSE input voltage level is too low.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="OverCurrent" summary="The EVSE detected charging current higher than allowed by charger.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="ContactWetFailure" summary="The EVSE detected voltage on charging pins when the contactor is open.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="ContactDryFailure" summary="The EVSE detected absence of voltage after enabling contactor.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="GroundFault" summary="The EVSE has an unbalanced current supply.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="PowerLoss" summary="The EVSE has detected a loss in power.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="PowerQuality" summary="The EVSE has detected another power quality issue (e.g. phase imbalance).">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="PilotShortCircuit" summary="The EVSE pilot signal amplitude short circuited to ground.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="EmergencyStop" summary="The emergency stop button was pressed.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="EVDisconnected" summary="The EVSE detected that the cable has been disconnected.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="WrongPowerSupply" summary="The EVSE could not determine proper power supply level.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="LiveNeutralSwap" summary="The EVSE detected Live and Neutral are swapped.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="OverTemperature" summary="The EVSE internal temperature is too high.">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="Other" summary="Any other reason.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StateEnum">
+      <item value="0" name="NotPluggedIn" summary="The EV is not plugged in.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="PluggedInNoDemand" summary="The EV is plugged in, but not demanding current.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PluggedInDemand" summary="The EV is plugged in and is demanding current, but EVSE is not allowing current to flow.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PluggedInCharging" summary="The EV is plugged in, charging is in progress, and current is flowing">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="PluggedInDischarging" summary="The EV is plugged in, discharging is in progress, and current is flowing">
+        <mandatoryConform>
+          <feature name="V2X"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="SessionEnding" summary="The EVSE is transitioning from any plugged-in state to NotPluggedIn">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Fault" summary="There is a fault, further details in the FaultState attribute">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SupplyStateEnum">
+      <item value="0" name="Disabled" summary="The EV is not currently allowed to charge or discharge">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ChargingEnabled" summary="The EV is currently allowed to charge">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="DischargingEnabled" summary="The EV is currently allowed to discharge">
+        <optionalConform>
+          <feature name="V2X"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="DisabledError" summary="The EV is not currently allowed to charge or discharge due to an error. The error must be cleared before operation can continue.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="DisabledDiagnostics" summary="The EV is not currently allowed to charge or discharge due to self-diagnostics mode.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Enabled" summary="The EV is currently allowed to charge and discharge">
+        <optionalConform>
+          <feature name="V2X"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <bitmap name="TargetDayOfWeekBitmap">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="ChargingTargetScheduleStruct">
+      <field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ChargingTargets" type="list">
+        <entry type="ChargingTargetStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ChargingTargetStruct">
+      <field id="0" name="TargetTimeMinutesPastMidnight" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="1439"/>
+        </constraint>
+      </field>
+      <field id="1" name="TargetSoC" type="percent" default="0">
+        <otherwiseConform>
+          <mandatoryConform>
+            <feature name="SOC"/>
+          </mandatoryConform>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+      </field>
+      <field id="2" name="AddedEnergy" type="energy-mWh" default="0">
+        <otherwiseConform>
+          <optionalConform>
+            <feature name="SOC"/>
+          </optionalConform>
+          <optionalConform choice="a" more="true" min="1"/>
+        </otherwiseConform>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="State" type="StateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="SupplyState" type="SupplyStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="FaultState" type="FaultStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="ChargingEnabledUntil" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="DischargingEnabledUntil" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="V2X"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="CircuitCapacity" type="amperage-mA">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="MinimumChargeCurrent" type="amperage-mA">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="MaximumChargeCurrent" type="amperage-mA">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="MaximumDischargeCurrent" type="amperage-mA">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="V2X"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="UserMaximumChargeCurrent" type="amperage-mA" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="RandomizationDelayWindow" type="elapsed-s" default="600">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <max value="86400"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0023" name="NextChargeStartTime" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0024" name="NextChargeTargetTime" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0025" name="NextChargeRequiredEnergy" type="energy-mWh">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0026" name="NextChargeTargetSoC" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0027" name="ApproximateEVEfficiency" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="PREF"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0030" name="StateOfCharge" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="SOC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0031" name="BatteryCapacity" type="energy-mWh">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="SOC"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0032" name="VehicleID" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PNC"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0040" name="SessionID" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0041" name="SessionDuration" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0042" name="SessionEnergyCharged" type="energy-mWh">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0043" name="SessionEnergyDischarged" type="energy-mWh">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="V2X"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="GetTargetsResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+      <field id="0" name="ChargingTargetSchedules" type="list">
+        <entry type="ChargingTargetScheduleStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="7"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="Disable" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="EnableCharging" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ChargingEnabledUntil" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinimumChargeCurrent" type="amperage-mA">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+      <field id="2" name="MaximumChargeCurrent" type="amperage-mA">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="EnableDischarging" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="V2X"/>
+      </mandatoryConform>
+      <field id="0" name="DischargingEnabledUntil" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaximumDischargeCurrent" type="amperage-mA">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="StartDiagnostics" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <optionalConform/>
+    </command>
+    <command id="0x05" name="SetTargets" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+      <field id="0" name="ChargingTargetSchedules" type="list">
+        <entry type="ChargingTargetScheduleStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="7"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="GetTargets" direction="commandToServer" response="GetTargetsResponse">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x07" name="ClearTargets" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="PREF"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="EVConnected" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SessionID" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="EVNotDetected" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SessionID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="State" type="StateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SessionDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SessionEnergyCharged" type="energy-mWh">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+      <field id="4" name="SessionEnergyDischarged" type="energy-mWh">
+        <mandatoryConform>
+          <feature name="V2X"/>
+        </mandatoryConform>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x02" name="EnergyTransferStarted" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SessionID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="State" type="StateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MaximumCurrent" type="amperage-mA">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+      <field id="3" name="MaximumDischargeCurrent" type="amperage-mA">
+        <mandatoryConform>
+          <feature name="V2X"/>
+        </mandatoryConform>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="EnergyTransferStopped" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SessionID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="State" type="StateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Reason" type="EnergyTransferStoppedReasonEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EnergyTransferred" type="energy-mWh">
+        <mandatoryConform/>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+      <field id="5" name="EnergyDischarged" type="energy-mWh">
+        <mandatoryConform>
+          <feature name="V2X"/>
+        </mandatoryConform>
+        <constraint>
+          <min value="0"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x04" name="Fault" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SessionID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="State" type="StateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FaultStatePreviousState" type="FaultStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="FaultStateCurrentState" type="FaultStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x05" name="RFID" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RFID"/>
+      </optionalConform>
+      <field id="0" name="UID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="10"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/EnergyPreference.xml b/data_model/1.6/clusters/EnergyPreference.xml
new file mode 100644
index 00000000000..3ee60dc5be5
--- /dev/null
+++ b/data_model/1.6/clusters/EnergyPreference.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009B" name="Energy Preference Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x009B" name="Energy Preference">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EPREF" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="BALA" name="EnergyBalance" summary="Device can balance energy consumption vs. another priority">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="LPMS" name="LowPowerModeSensitivity" summary="Device can adjust the conditions for entering a low power mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EnergyPriorityEnum">
+      <item value="0" name="Comfort" summary="User comfort">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Speed" summary="Speed of operation">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Efficiency" summary="Amount of Energy consumed by the device">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WaterConsumption" summary="Amount of water consumed by the device">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="BalanceStruct">
+      <field id="0" name="Step" type="percent">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Label" type="string">
+        <quality persistence="fixed"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="EnergyBalances" type="list">
+      <entry type="BalanceStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="2"/>
+          <to value="10"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentEnergyBalance" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="EnergyPriorities" type="list">
+      <entry type="EnergyPriorityEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+      <constraint>
+        <allowed value="2"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="LowPowerModeSensitivities" type="list">
+      <entry type="BalanceStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="LPMS"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="2"/>
+          <to value="10"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="CurrentLowPowerModeSensitivity" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="LPMS"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/FanControl.xml b/data_model/1.6/clusters/FanControl.xml
new file mode 100644
index 00000000000..cb10bc88925
--- /dev/null
+++ b/data_model/1.6/clusters/FanControl.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control Cluster" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
+    <revision revision="3" summary="Addition of AirflowDirection and Step command"/>
+    <revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
+    <revision revision="5" summary="Clarified attribute usage, added conformance column"/>
+    <revision revision="6" summary="Removed Zigbee related elements, removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0202" name="Fan Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="FAN" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SPD" name="MultiSpeed" summary="0-SpeedMax Fan Speeds">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="AUT" name="Auto" summary="Automatic mode supported for fan speed">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="RCK" name="Rocking" summary="Rocking movement supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="WND" name="Wind" summary="Wind emulation supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="STEP" name="Step" summary="Step command supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="DIR" name="AirflowDirection" summary="Airflow Direction attribute is supported">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AirflowDirectionEnum">
+      <item value="0" name="Forward" summary="Airflow is in the forward direction">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Reverse" summary="Airflow is in the reverse direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="FanModeEnum">
+      <item value="0" name="Off" summary="Fan is off">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Fan using low speed">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Medium" summary="Fan using medium speed">
+        <optionalConform>
+          <value name="Low"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="High" summary="Fan using high speed">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="On">
+        <deprecateConform/>
+      </item>
+      <item value="5" name="Auto" summary="Fan is using auto mode">
+        <mandatoryConform>
+          <feature name="AUT"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="Smart" summary="Fan is using smart mode">
+        <deprecateConform/>
+      </item>
+    </enum>
+    <enum name="FanModeSequenceEnum">
+      <item value="0" name="OffLowMedHigh" summary="Fan is capable of off, low, medium and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+      <item value="1" name="OffLowHigh" summary="Fan is capable of off, low and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+      <item value="2" name="OffLowMedHighAuto" summary="Fan is capable of off, low, medium, high and auto modes">
+        <optionalConform choice="b">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="OffLowHighAuto" summary="Fan is capable of off, low, high and auto modes">
+        <optionalConform choice="b">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="OffHighAuto" summary="Fan is capable of off, high and auto modes">
+        <optionalConform choice="b">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="OffHigh" summary="Fan is capable of off and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="StepDirectionEnum">
+      <item value="0" name="Increase" summary="Step moves in increasing direction">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Decrease" summary="Step moves in decreasing direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="RockBitmap">
+      <bitfield name="RockLeftRight" bit="0" summary="Indicate rock left to right">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RockUpDown" bit="1" summary="Indicate rock up and down">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RockRound" bit="2" summary="Indicate rock around">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="WindBitmap">
+      <bitfield name="SleepWind" bit="0" summary="Indicate sleep wind">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="NaturalWind" bit="1" summary="Indicate natural wind">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="FanMode" type="FanModeEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="FanModeSequence" type="FanModeSequenceEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="PercentSetting" type="percent">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="100"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="PercentCurrent" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="100"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="SpeedMax" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="100"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="SpeedSetting" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <attribute name="SpeedMax"/>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="SpeedCurrent" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <attribute name="SpeedMax"/>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="RockSupport" type="RockBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="RCK"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="RockSetting" type="RockBitmap">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RCK"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="WindSupport" type="WindBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="WND"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="WindSetting" type="WindBitmap">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="WND"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="AirflowDirection" type="AirflowDirectionEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="DIR"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Step" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="STEP"/>
+      </mandatoryConform>
+      <field id="0" name="Direction" type="StepDirectionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Wrap" type="bool" default="false">
+        <optionalConform/>
+      </field>
+      <field id="2" name="LowestOff" type="bool" default="true">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/FixedLabel-Cluster.xml b/data_model/1.6/clusters/FixedLabel-Cluster.xml
new file mode 100644
index 00000000000..12bec55222c
--- /dev/null
+++ b/data_model/1.6/clusters/FixedLabel-Cluster.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0040" name="Fixed Label Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0040" name="Fixed Label"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Label" role="utility" picsCode="FLABEL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list" default="empty">
+      <entry type="LabelStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/FlowMeasurement.xml b/data_model/1.6/clusters/FlowMeasurement.xml
new file mode 100644
index 00000000000..e001c80913c
--- /dev/null
+++ b/data_model/1.6/clusters/FlowMeasurement.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0404" name="Flow Measurement Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0404" name="Flow Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="FLW" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="65533"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <attribute name="MinMeasuredValue"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/GeneralCommissioningCluster.xml b/data_model/1.6/clusters/GeneralCommissioningCluster.xml
new file mode 100644
index 00000000000..a68c4e1510d
--- /dev/null
+++ b/data_model/1.6/clusters/GeneralCommissioningCluster.xml
@@ -0,0 +1,328 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0030" name="General Commissioning Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add Enhanced Setup Flow"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0030" name="General Commissioning"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="CGEN" scope="Node"/>
+  <features>
+    <feature bit="0" code="TC" name="TermsAndConditions" summary="Supports Terms &amp; Conditions acknowledgement">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="NR" name="NetworkRecovery" summary="Supports Network Recovery">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CommissioningErrorEnum">
+      <item value="0" name="OK" summary="No error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ValueOutsideRange" summary="Attempting to set regulatory configuration to a region or indoor/outdoor mode for which the server does not have proper configuration.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidAuthentication" summary="Executed CommissioningComplete outside CASE session.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NoFailSafe" summary="Executed CommissioningComplete when there was no active Fail-Safe context.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="BusyWithOtherAdmin" summary="Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="RequiredTCNotAccepted" summary="One or more required TC features from the Enhanced Setup Flow were not accepted.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="TCAcknowledgementsNotReceived" summary="TCAcknowledgementsNotReceived No or insufficient acknowledgements from the user for the TC features were received.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="TCMinVersionNotMet" summary="TCMinVersionNotMet The version of the TC features acknowledged by the user did not meet the minimum required version.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="NetworkRecoveryReasonEnum">
+      <item value="0" name="Unspecified" summary="Unspecified / unknown reason of network failure">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Auth" summary="Credentials for the configured operational network are not valid">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Visibility" summary="Configured network cannot be found (e.g. the device cannot see the configured Wi-Fi SSID, Thread end-node is unable to find a parent router on the PAN)">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="RegulatoryLocationTypeEnum">
+      <item value="0" name="Indoor" summary="Indoor only">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Outdoor" summary="Outdoor only">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="IndoorOutdoor" summary="Indoor/Outdoor">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="BasicCommissioningInfo">
+      <field id="0" name="FailSafeExpiryLengthSeconds" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxCumulativeFailsafeSeconds" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Breadcrumb" type="uint64" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="BasicCommissioningInfo" type="BasicCommissioningInfo">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="RegulatoryConfig" type="RegulatoryLocationTypeEnum">
+      <default>
+        <attribute name="LocationCapability"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="LocationCapability" type="RegulatoryLocationTypeEnum">
+      <default>
+        <enum default="IndoorOutdoor"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="SupportsConcurrentConnection" type="bool" default="true">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="TCAcceptedVersion" type="uint16">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="TCMinRequiredVersion" type="uint16">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="TCAcknowledgements" type="map16">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="TCAcknowledgementsRequired" type="bool" default="true">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="TCUpdateDeadline" type="uint32">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="RecoveryIdentifier" type="octstr" default="0">
+      <access read="true" readPrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="NR"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <allowed value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="NetworkRecoveryReason" type="NetworkRecoveryReasonEnum" default="null">
+      <access read="true" readPrivilege="manage"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="NR"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000C" name="IsCommissioningWithoutPower" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ArmFailSafe" direction="commandToServer" response="ArmFailSafeResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="ExpiryLengthSeconds" type="uint16" default="900">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ArmFailSafeResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="SUCCESS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DebugText" type="string" default="&quot;&quot;">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="SetRegulatoryConfig" direction="commandToServer" response="SetRegulatoryConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="NewRegulatoryConfig" type="RegulatoryLocationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CountryCode" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="2"/>
+        </constraint>
+      </field>
+      <field id="2" name="Breadcrumb" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="SetRegulatoryConfigResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="SUCCESS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DebugText" type="string" default="&quot;&quot;">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="CommissioningComplete" direction="commandToServer" response="CommissioningCompleteResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="CommissioningCompleteResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="SUCCESS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DebugText" type="string" default="&quot;&quot;">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="SetTCAcknowledgements" direction="commandToServer" response="SetTCAcknowledgementsResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+      <field id="0" name="TCVersion" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="TCUserResponse" type="map16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="SetTCAcknowledgementsResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="TC"/>
+      </mandatoryConform>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="SUCCESS">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Group-Key-Management-Cluster.xml b/data_model/1.6/clusters/Group-Key-Management-Cluster.xml
new file mode 100644
index 00000000000..d8955ae939e
--- /dev/null
+++ b/data_model/1.6/clusters/Group-Key-Management-Cluster.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003F" name="Group Key Management Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Clarify KeySetWrite validation and behavior on invalid epoch key lengths"/>
+    <revision revision="3" summary="Refocus on pure key management; move group management to Groupcast cluster"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x003F" name="Group Key Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="GRPKEY" scope="Node"/>
+  <features>
+    <feature bit="0" code="CS" name="CacheAndSync" summary="The ability to support CacheAndSync security policy and MCSP.">
+      <provisionalConform/>
+    </feature>
+    <feature bit="1" code="GCAST" name="Groupcast" summary="The device supports groups using the Groupcast cluster.">
+      <mandatoryConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="GroupKeyMulticastPolicyEnum">
+      <item value="0" name="PerGroupID" summary="Indicates filtering of multicast messages for a specific Group ID">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AllNodes" summary="Indicates not filtering of multicast messages">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="GroupKeySecurityPolicyEnum">
+      <item value="0" name="TrustFirst" summary="Message counter synchronization using trust-first">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CacheAndSync" summary="Message counter synchronization using cache-and-sync">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <feature name="CS"/>
+          </mandatoryConform>
+        </otherwiseConform>
+      </item>
+    </enum>
+    <struct name="GroupInfoMapStruct">
+      <field id="1" name="GroupId" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="GroupName" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="GroupKeyMapStruct">
+      <field id="1" name="GroupId" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="GroupKeySetStruct">
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupKeySecurityPolicy" type="GroupKeySecurityPolicyEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EpochKey0" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="EpochStartTime0" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EpochKey1" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="5" name="EpochStartTime1" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="EpochKey2" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="7" name="EpochStartTime2" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="GroupKeyMulticastPolicy" type="GroupKeyMulticastPolicyEnum">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="GroupcastAdoptionStruct">
+      <field id="0" name="GroupcastAdopted" type="bool">
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="GroupKeyMap" type="list" default="empty">
+      <entry type="GroupKeyMapStruct"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="GroupTable" type="list" default="empty">
+      <entry type="GroupInfoMapStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxGroupsPerFabric" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="MaxGroupKeysPerFabric" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="65535"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="GroupcastAdoption" type="list">
+      <entry type="GroupcastAdoptionStruct"/>
+      <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="GCAST"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="KeySetWrite" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySet" type="GroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="KeySetRead" direction="commandToServer" response="KeySetReadResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="KeySetReadResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySet" type="GroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="KeySetRemove" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="KeySetReadAllIndices" direction="commandToServer" response="KeySetReadAllIndicesResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="DoNotUse">
+        <disallowConform/>
+      </field>
+    </command>
+    <command id="0x05" name="KeySetReadAllIndicesResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetIDs" type="list">
+        <entry type="uint16"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Groupcast.xml b/data_model/1.6/clusters/Groupcast.xml
new file mode 100644
index 00000000000..bc84aa2f06f
--- /dev/null
+++ b/data_model/1.6/clusters/Groupcast.xml
@@ -0,0 +1,385 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0065" name="Groupcast Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release, replacing functionality previously in Groups and Group Key Management clusters and addressing issues with application of those clusters (TCR 11433)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0065" name="Groupcast">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="GC" scope="Node"/>
+  <features>
+    <feature bit="0" code="LN" name="Listener" summary="Supports joining a multicast group of nodes as a listener.">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="SD" name="Sender" summary="Supports sending multicast message to a targeted group of nodes.">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="PGA" name="PerGroup" summary="Supports PerGroup multicast addresses.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="GroupcastTestResultEnum">
+      <item value="0" name="Success" summary="There was no failure">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GeneralError" summary="Other error during processing not otherwise covered">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="MessageReplay" summary="Message counter was &lt;= counter from last received">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="FailedAuth" summary="Message authentication failed">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="NoAvailableKey" summary="No key was found to process the message">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="SendFailure" summary="Issue with attempting to send a multicast IPv6 message">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="GroupcastTestingEnum">
+      <item value="0" name="DisableTesting" summary="Disable all test event generation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="EnableListenerTesting" summary="Enable Listener test event generation">
+        <mandatoryConform>
+          <feature name="LN"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="EnableSenderTesting" summary="Enable Sender test event generation">
+        <mandatoryConform>
+          <feature name="SD"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="MulticastAddrPolicyEnum">
+      <item value="0" name="IanaAddr" summary="Indicates group uses the IANA-assigned multicast address (default)">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="PerGroup" summary="Group uses multicast address scoped to Fabric ID and Group ID">
+        <mandatoryConform>
+          <feature name="PGA"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="MembershipStruct">
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <mandatoryConform>
+          <feature name="LN"/>
+        </mandatoryConform>
+        <constraint>
+          <maxCount value="255"/>
+        </constraint>
+      </field>
+      <field id="2" name="KeySetID" type="uint16">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="HasAuxiliaryACL" type="bool">
+        <mandatoryConform>
+          <feature name="LN"/>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="McastAddrPolicy" type="MulticastAddrPolicyEnum" default="0">
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Membership" type="list">
+      <entry type="MembershipStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MaxMembershipCount" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <constraint>
+        <min value="10"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMcastAddrCount" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="UsedMcastAddrCount" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0004" name="FabricUnderTest" type="fabric-idx">
+      <access read="true" readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="JoinGroup" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="KeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Key" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="4" name="UseAuxiliaryACL" type="bool">
+        <optionalConform>
+          <feature name="LN"/>
+        </optionalConform>
+      </field>
+      <field id="5" name="ReplaceEndpoints" type="bool">
+        <optionalConform>
+          <feature name="LN"/>
+        </optionalConform>
+      </field>
+      <field id="6" name="McastAddrPolicy" type="MulticastAddrPolicyEnum">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="LeaveGroup" direction="commandToServer" response="LeaveGroupResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <optionalConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="20"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="LeaveGroupResponse" direction="responseFromServer">
+      <access fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoints" type="list">
+        <entry type="endpoint-no"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="20"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="UpdateGroupKey" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="KeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Key" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="ConfigureAuxiliaryACL" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="LN"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="UseAuxiliaryACL" type="bool">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="GroupcastTesting" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="TestOperation" type="GroupcastTestingEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DurationSeconds" type="uint16" default="60">
+        <optionalConform/>
+        <constraint>
+          <between>
+            <from value="10"/>
+            <to value="1200"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="GroupcastTesting" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="SourceIpAddress" type="ipv6adr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="DestinationIpAddress" type="ipv6adr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <optionalConform/>
+      </field>
+      <field id="3" name="EndpointID" type="endpoint-id">
+        <optionalConform/>
+      </field>
+      <field id="4" name="ClusterID" type="cluster-id">
+        <optionalConform/>
+      </field>
+      <field id="5" name="ElementID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="6" name="AccessAllowed" type="bool">
+        <optionalConform/>
+      </field>
+      <field id="7" name="GroupcastTestResult" type="GroupcastTestResultEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/Groups.xml b/data_model/1.6/clusters/Groups.xml
new file mode 100644
index 00000000000..4fbe5cf443b
--- /dev/null
+++ b/data_model/1.6/clusters/Groups.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0004" name="Groups Cluster" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1745 2100"/>
+    <revision revision="2" summary="CCB 2289"/>
+    <revision revision="3" summary="CCB 2310 2704"/>
+    <revision revision="4" summary="New data model format and notation"/>
+    <revision revision="5" summary="Deprecation of Groups cluster, introduction of Groupcast cluster"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0004" name="Groups"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="G" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="GN" name="GroupNames" summary="The ability to store a name for a group.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="NameSupportBitmap">
+      <bitfield name="GroupNames" bit="7" summary="The ability to store a name for a group.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NameSupport" type="NameSupportBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddGroup" direction="commandToServer" response="AddGroupResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x00" name="AddGroupResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ViewGroup" direction="commandToServer" response="ViewGroupResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ViewGroupResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="GetGroupMembership" direction="commandToServer" response="GetGroupMembershipResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupList" type="list">
+        <entry type="group-id">
+          <constraint>
+            <min value="1"/>
+          </constraint>
+        </entry>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="GetGroupMembershipResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Capacity" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupList" type="list">
+        <entry type="group-id">
+          <constraint>
+            <min value="1"/>
+          </constraint>
+        </entry>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveGroup" direction="commandToServer" response="RemoveGroupResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveGroupResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="RemoveAllGroups" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="AddGroupIfIdentifying" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ICDManagement.xml b/data_model/1.6/clusters/ICDManagement.xml
new file mode 100644
index 00000000000..7f01cd5dae6
--- /dev/null
+++ b/data_model/1.6/clusters/ICDManagement.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Addition of LIT ICD support, UserActiveModeTrigger, ActiveModeDuration, StayActiveResponse; removal of field Key in MonitoringRegistrationStruct"/>
+    <revision revision="3" summary="Addition of the ClientType attribute; addition of the ICD Check-In Backoff support; addition of the DynamicSitLitSupport feature"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0046" name="ICD Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="ICDM" scope="Node"/>
+  <features>
+    <feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LITS"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="1" code="UAT" name="UserActiveModeTrigger" summary="Device supports the user active mode trigger feature.">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LITS"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="DSLS" name="DynamicSitLitSupport" summary="Device supports dynamic switching from SIT to LIT operating modes.">
+      <optionalConform>
+        <feature name="LITS"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ClientTypeEnum">
+      <item value="0" name="Permanent" summary="The client is typically resident, always-on, fixed infrastructure in the home.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Ephemeral" summary="The client is mobile or non-resident or not always-on and may not always be available in the home.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperatingModeEnum">
+      <item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LIT" summary="ICD is operating as a Long Idle Time ICD.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="UserActiveModeTriggerBitmap">
+      <bitfield name="PowerCycle" bit="0" summary="Power Cycle to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SettingsMenu" bit="1" summary="Settings menu on the device informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CustomInstruction" bit="2" summary="Custom Instruction on how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DeviceManual" bit="3" summary="Device Manual informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensor" bit="4" summary="Actuate Sensor to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorSeconds" bit="5" summary="Actuate Sensor for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorTimes" bit="6" summary="Actuate Sensor N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorLightsBlink" bit="7" summary="Actuate Sensor until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButton" bit="8" summary="Press Reset Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonLightsBlink" bit="9" summary="Press Reset Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonSeconds" bit="10" summary="Press Reset Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonTimes" bit="11" summary="Press Reset Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButton" bit="12" summary="Press Setup Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonSeconds" bit="13" summary="Press Setup Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonLightsBlink" bit="14" summary="Press Setup Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonTimes" bit="15" summary="Press Setup Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AppDefinedButton" bit="16" summary="Press the N Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="MonitoringRegistrationStruct">
+      <field id="1" name="CheckInNodeID" type="node-id">
+        <access fabricSensitive="true"/>
+        <quality persistence="nonVolatile"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MonitoredSubject" type="subject-id">
+        <access fabricSensitive="true"/>
+        <quality persistence="nonVolatile"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Key">
+        <deprecateConform/>
+      </field>
+      <field id="4" name="ClientType" type="ClientTypeEnum" default="0">
+        <access fabricSensitive="true"/>
+        <quality persistence="nonVolatile"/>
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="IdleModeDuration" type="uint32" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="64800"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ActiveModeDuration" type="uint32" default="300">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ActiveModeThreshold" type="uint16" default="300">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="RegisteredClients" type="list" default="empty">
+      <entry type="MonitoringRegistrationStruct"/>
+      <access read="true" readPrivilege="admin" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="ICDCounter" type="uint32" default="0">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="ClientsSupportedPerFabric" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="UserActiveModeTriggerHint" type="UserActiveModeTriggerBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="UAT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="UserActiveModeTriggerInstruction" type="string" default="&quot;&quot;">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <describedConform/>
+      <constraint>
+        <maxLength value="128"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="OperatingMode" type="OperatingModeEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LITS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="MaximumCheckInBackoff" type="uint32" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="IdleModeDuration"/>
+          </from>
+          <to value="64800"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="RegisterClient" direction="commandToServer" response="RegisterClientResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="CheckInNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MonitoredSubject" type="subject-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Key" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="VerificationKey" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="4" name="ClientType" type="ClientTypeEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="RegisterClientResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="ICDCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="UnregisterClient" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="CIP"/>
+      </mandatoryConform>
+      <field id="0" name="CheckInNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VerificationKey" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="StayActiveRequest" direction="commandToServer" response="StayActiveResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LITS"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="StayActiveDuration" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StayActiveResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="LITS"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="PromisedActiveDuration" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Identify.xml b/data_model/1.6/clusters/Identify.xml
new file mode 100644
index 00000000000..a919486e30f
--- /dev/null
+++ b/data_model/1.6/clusters/Identify.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0003" name="Identify Cluster" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2808"/>
+    <revision revision="3" summary="All Hubs changes"/>
+    <revision revision="4" summary="New data model format and notation; add IdentifyType"/>
+    <revision revision="5" summary="Removed Query feature"/>
+    <revision revision="6" summary="Added Q quality for IdentifyTime attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0003" name="Identify"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="I" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="EffectIdentifierEnum">
+      <item value="0x00" name="Blink" summary="e.g., Light is turned on/off once.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Breathe" summary="e.g., Light is turned on/off over 1 second and repeated 15 times.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Okay" summary="e.g., Colored light turns green for 1 second; non-colored light flashes twice.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0B" name="ChannelChange" summary="e.g., Colored light turns orange for 8 seconds; non-colored light switches to the maximum brightness for 0.5s and then minimum brightness for 7.5s.">
+        <mandatoryConform/>
+      </item>
+      <item value="0xFE" name="FinishEffect" summary="Complete the current effect sequence before terminating. e.g., if in the middle of a breathe effect (as above), first complete the current 1s breathe effect and then terminate the effect.">
+        <mandatoryConform/>
+      </item>
+      <item value="0xFF" name="StopEffect" summary="Terminate the effect as soon as possible.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EffectVariantEnum">
+      <item value="0x00" name="Default" summary="Indicates the default effect is used">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="IdentifyTypeEnum">
+      <item value="0x00" name="None" summary="No presentation.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="LightOutput" summary="Light output of a lighting product.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="VisibleIndicator" summary="Typically a small LED.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="AudibleBeep">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="Display" summary="Presentation will be visible on display screen.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x05" name="Actuator" summary="Presentation will be conveyed by actuator functionality such as through a window blind operation or in-wall relay.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="IdentifyTime" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality quieterReporting="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="IdentifyType" type="IdentifyTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Identify" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="IdentifyTime" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x40" name="TriggerEffect" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <optionalConform/>
+      <field id="0" name="EffectIdentifier" type="EffectIdentifierEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="EffectVariant" type="EffectVariantEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/IlluminanceMeasurement.xml b/data_model/1.6/clusters/IlluminanceMeasurement.xml
new file mode 100644
index 00000000000..89e74089a4e
--- /dev/null
+++ b/data_model/1.6/clusters/IlluminanceMeasurement.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0400" name="Illuminance Measurement Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 2048 2049 2050"/>
+    <revision revision="2" summary="CCB 2167"/>
+    <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0400" name="Illuminance Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="ILL" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="LightSensorTypeEnum">
+      <item value="0" name="Photodiode" summary="Indicates photodiode sensor type">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CMOS" summary="Indicates CMOS sensor type">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="0"/>
+      </constraint>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="65533"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <attribute name="MinMeasuredValue"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="LightSensorType" type="LightSensorTypeEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/JointFabricAdministratorCluster.xml b/data_model/1.6/clusters/JointFabricAdministratorCluster.xml
new file mode 100644
index 00000000000..0424d873f98
--- /dev/null
+++ b/data_model/1.6/clusters/JointFabricAdministratorCluster.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0753" name="Joint Fabric Administrator Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0753" name="Joint Fabric Administrator">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="JFPKI" scope="Node"/>
+  <dataTypes>
+    <enum name="ICACCSRResponseStatusCodeEnum">
+      <item value="0" name="OK" summary="No error">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="1" name="Busy" summary="Could not be completed because another commissioning is in progress">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="2" name="PAKEParameterError" summary="Provided PAKE parameters were incorrectly formatted or otherwise invalid">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="3" name="WindowNotOpen" summary="The Joint Commissioning Method commissioning window is not currently open">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="4" name="VIDNotVerified" summary="ICACCSRRequest command has been invoked by a peer against which Fabric Table VID Verification hasn&apos;t been executed">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="5" name="InvalidAdministratorFabricIndex" summary="OpenJointCommissioningWindow command has been invoked but the AdministratorFabricIndex field has the value of null">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+    </enum>
+    <enum name="ICACResponseStatusEnum">
+      <item value="0" name="OK" summary="No error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="InvalidPublicKey" summary="Public Key in the ICAC is invalid">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidICAC" summary="ICAC chain validation failed / ICAC DN Encoding rules verification failed">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TransferAnchorResponseStatusEnum">
+      <item value="0" name="OK" summary="No error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="TransferAnchorStatusDatastoreBusy" summary="Anchor Transfer was not started due to on-going Datastore operations">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="TransferAnchorStatusNoUserConsent" summary="User has not consented for Anchor Transfer">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AdministratorFabricIndex" type="fabric-idx">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ICACCSRRequest" direction="commandToServer" response="ICACCSRResponse">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x01" name="ICACCSRResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="StatusCode" type="ICACCSRResponseStatusCodeEnum">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+      <field id="1" name="ICACCSR" type="octstr">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <equalTerm>
+              <field name="StatusCode"/>
+              <status name="SUCCESS"/>
+            </equalTerm>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <maxLength value="600"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="AddICAC" direction="commandToServer" response="ICACResponse">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="1" name="ICACValue" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="ICACResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="StatusCode" type="ICACResponseStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="OpenJointCommissioningWindow" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="PAKEPasscodeVerifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="97"/>
+        </constraint>
+      </field>
+      <field id="2" name="Discriminator" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="4095"/>
+        </constraint>
+      </field>
+      <field id="3" name="Iterations" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1000"/>
+            <to value="100000"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="Salt" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="16"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="TransferAnchorRequest" direction="commandToServer" response="TransferAnchorResponse">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x06" name="TransferAnchorResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="StatusCode" type="TransferAnchorResponseStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="TransferAnchorComplete" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x08" name="AnnounceJointFabricAdministrator" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/JointFabricDatastoreCluster.xml b/data_model/1.6/clusters/JointFabricDatastoreCluster.xml
new file mode 100644
index 00000000000..5af24d1cf97
--- /dev/null
+++ b/data_model/1.6/clusters/JointFabricDatastoreCluster.xml
@@ -0,0 +1,874 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0752" name="Joint Fabric Datastore Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0752" name="Joint Fabric Datastore">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="JFDS" scope="Node"/>
+  <dataTypes>
+    <enum name="DatastoreAccessControlEntryAuthModeEnum">
+      <item value="1" name="PASE" summary="Passcode authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CASE" summary="Certificate authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Group" summary="Group authenticated session">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DatastoreAccessControlEntryPrivilegeEnum">
+      <item value="1" name="View" summary="Can read and observe all (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ProxyView">
+        <deprecateConform/>
+      </item>
+      <item value="3" name="Operate" summary="View privileges, and can perform the primary function of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Manage" summary="Operate privileges, and can modify persistent configuration of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Administer" summary="Manage privileges, and can observe and modify the Access Control Cluster">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DatastoreGroupKeyMulticastPolicyEnum">
+      <item value="0" name="PerGroupID" summary="Indicates filtering of multicast messages for a specific Group ID">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AllNodes" summary="Indicates not filtering of multicast messages">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DatastoreGroupKeySecurityPolicyEnum">
+      <item value="0" name="TrustFirst" summary="Message counter synchronization using trust-first">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DatastoreStateEnum">
+      <item value="0" name="Pending" summary="Target device operation is pending">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Committed" summary="Target device operation has been committed">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="DeletePending" summary="Target device delete operation is pending">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="CommitFailed" summary="Target device operation has failed">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="DatastoreACLEntryStruct">
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ACLEntry" type="DatastoreAccessControlEntryStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreAccessControlEntryStruct">
+      <field id="1" name="Privilege" type="DatastoreAccessControlEntryPrivilegeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="AuthMode" type="DatastoreAccessControlEntryAuthModeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Subjects" type="list">
+        <entry type="subject-id"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount>
+            <attribute name="SubjectsPerAccessControlEntry" cluster="Access Control"/>
+          </maxCount>
+        </constraint>
+      </field>
+      <field id="4" name="Targets" type="list">
+        <entry type="DatastoreAccessControlTargetStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount>
+            <attribute name="TargetsPerAccessControlEntry" cluster="Access Control"/>
+          </maxCount>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="DatastoreAccessControlTargetStruct">
+      <field id="0" name="Cluster" type="cluster-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DeviceType" type="devtype-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreAdministratorInformationEntryStruct">
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="3" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="ICAC" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="DatastoreBindingTargetStruct">
+      <field id="1" name="Node" type="node-id">
+        <mandatoryConform>
+          <field name="Endpoint"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Group" type="group-id">
+        <mandatoryConform>
+          <notTerm>
+            <field name="Endpoint"/>
+          </notTerm>
+        </mandatoryConform>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="3" name="Endpoint" type="endpoint-no">
+        <mandatoryConform>
+          <notTerm>
+            <field name="Group"/>
+          </notTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="Cluster" type="cluster-id">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreEndpointBindingEntryStruct">
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Binding" type="DatastoreBindingTargetStruct">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="StatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreEndpointEntryStruct">
+      <field id="0" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="3" name="StatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreEndpointGroupIDEntryStruct">
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreGroupInformationEntryStruct">
+      <field id="0" name="GroupID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="GroupCAT" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreGroupKeySetStruct">
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupKeySecurityPolicy" type="DatastoreGroupKeySecurityPolicyEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EpochKey0" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="EpochStartTime0" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EpochKey1" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="5" name="EpochStartTime1" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="EpochKey2" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="7" name="EpochStartTime2" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="GroupKeyMulticastPolicy" type="DatastoreGroupKeyMulticastPolicyEnum">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+    </struct>
+    <struct name="DatastoreNodeInformationEntryStruct">
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="3" name="CommissioningStatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreNodeKeySetEntryStruct">
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StatusEntry" type="DatastoreStatusEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DatastoreStatusEntryStruct">
+      <field id="0" name="State" type="DatastoreStateEnum" default="Pending">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="UpdateTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FailureCode" type="status" default="SUCCESS">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AnchorRootCA" type="octstr">
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0001" name="AnchorNodeID" type="node-id">
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0002" name="AnchorVendorID" type="vendor-id">
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0003" name="FriendlyName" type="string">
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <constraint>
+        <maxLength value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="GroupKeySetList" type="list">
+      <entry type="DatastoreGroupKeySetStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0005" name="GroupList" type="list">
+      <entry type="DatastoreGroupInformationEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0006" name="NodeList" type="list">
+      <entry type="DatastoreNodeInformationEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0007" name="AdminList" type="list">
+      <entry type="DatastoreAdministratorInformationEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0008" name="Status" type="DatastoreStatusEntryStruct">
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0009" name="EndpointGroupIDList" type="list">
+      <entry type="DatastoreEndpointGroupIDEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000A" name="EndpointBindingList" type="list">
+      <entry type="DatastoreEndpointBindingEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000B" name="NodeKeySetList" type="list">
+      <entry type="DatastoreNodeKeySetEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000C" name="NodeACLList" type="list">
+      <entry type="DatastoreACLEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000D" name="NodeEndpointList" type="list">
+      <entry type="DatastoreEndpointEntryStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddKeySet" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupKeySet" type="DatastoreGroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="UpdateKeySet" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupKeySet" type="DatastoreGroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveKeySet" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="AddGroup" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="GroupCAT" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="UpdateGroup" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="GroupCAT" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="RemoveGroup" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="AddAdmin" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="3" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="ICAC" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="UpdateAdmin" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="ICAC" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="RemoveAdmin" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x09" name="AddPendingNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="RefreshNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0B" name="UpdateNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="RemoveNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0D" name="UpdateEndpointForNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="FriendlyName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0E" name="AddGroupIDToEndpointForNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0F" name="RemoveGroupIDFromEndpointForNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x10" name="AddBindingToEndpointForNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Binding" type="DatastoreBindingTargetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x11" name="RemoveBindingFromEndpointForNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="ListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x12" name="AddACLToNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ACLEntry" type="DatastoreAccessControlEntryStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x13" name="RemoveACLFromNode" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <field id="0" name="ListID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/KeypadInput.xml b/data_model/1.6/clusters/KeypadInput.xml
new file mode 100644
index 00000000000..faded2ff95b
--- /dev/null
+++ b/data_model/1.6/clusters/KeypadInput.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0509" name="Keypad Input Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0509" name="Keypad Input"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="KEYPADINPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NV" name="NavigationKeyCodes" summary="Supports UP, DOWN, LEFT, RIGHT, SELECT, BACK, EXIT, MENU">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LK" name="LocationKeys" summary="Supports CEC keys 0x0A (Settings) and 0x09 (Home)">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="NK" name="NumberKeys" summary="Supports numeric input 0..9">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CecKeyCodeEnum">
+      <item value="0x00" name="Select">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Up">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Down">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="Left">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="Right">
+        <mandatoryConform/>
+      </item>
+      <item value="0x05" name="RightUp">
+        <mandatoryConform/>
+      </item>
+      <item value="0x06" name="RightDown">
+        <mandatoryConform/>
+      </item>
+      <item value="0x07" name="LeftUp">
+        <mandatoryConform/>
+      </item>
+      <item value="0x08" name="LeftDown">
+        <mandatoryConform/>
+      </item>
+      <item value="0x09" name="RootMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0A" name="SetupMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0B" name="ContentsMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0C" name="FavoriteMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0D" name="Exit">
+        <mandatoryConform/>
+      </item>
+      <item value="0x10" name="MediaTopMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x11" name="MediaContextSensitiveMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="0x1D" name="NumberEntryMode">
+        <mandatoryConform/>
+      </item>
+      <item value="0x1E" name="Number11">
+        <mandatoryConform/>
+      </item>
+      <item value="0x1F" name="Number12">
+        <mandatoryConform/>
+      </item>
+      <item value="0x20" name="Number0OrNumber10">
+        <mandatoryConform/>
+      </item>
+      <item value="0x21" name="Numbers1">
+        <mandatoryConform/>
+      </item>
+      <item value="0x22" name="Numbers2">
+        <mandatoryConform/>
+      </item>
+      <item value="0x23" name="Numbers3">
+        <mandatoryConform/>
+      </item>
+      <item value="0x24" name="Numbers4">
+        <mandatoryConform/>
+      </item>
+      <item value="0x25" name="Numbers5">
+        <mandatoryConform/>
+      </item>
+      <item value="0x26" name="Numbers6">
+        <mandatoryConform/>
+      </item>
+      <item value="0x27" name="Numbers7">
+        <mandatoryConform/>
+      </item>
+      <item value="0x28" name="Numbers8">
+        <mandatoryConform/>
+      </item>
+      <item value="0x29" name="Numbers9">
+        <mandatoryConform/>
+      </item>
+      <item value="0x2A" name="Dot">
+        <mandatoryConform/>
+      </item>
+      <item value="0x2B" name="Enter">
+        <mandatoryConform/>
+      </item>
+      <item value="0x2C" name="Clear">
+        <mandatoryConform/>
+      </item>
+      <item value="0x2F" name="NextFavorite">
+        <mandatoryConform/>
+      </item>
+      <item value="0x30" name="ChannelUp">
+        <mandatoryConform/>
+      </item>
+      <item value="0x31" name="ChannelDown">
+        <mandatoryConform/>
+      </item>
+      <item value="0x32" name="PreviousChannel">
+        <mandatoryConform/>
+      </item>
+      <item value="0x33" name="SoundSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="0x34" name="InputSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="0x35" name="DisplayInformation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x36" name="Help">
+        <mandatoryConform/>
+      </item>
+      <item value="0x37" name="PageUp">
+        <mandatoryConform/>
+      </item>
+      <item value="0x38" name="PageDown">
+        <mandatoryConform/>
+      </item>
+      <item value="0x40" name="Power">
+        <mandatoryConform/>
+      </item>
+      <item value="0x41" name="VolumeUp">
+        <mandatoryConform/>
+      </item>
+      <item value="0x42" name="VolumeDown">
+        <mandatoryConform/>
+      </item>
+      <item value="0x43" name="Mute">
+        <mandatoryConform/>
+      </item>
+      <item value="0x44" name="Play">
+        <mandatoryConform/>
+      </item>
+      <item value="0x45" name="Stop">
+        <mandatoryConform/>
+      </item>
+      <item value="0x46" name="Pause">
+        <mandatoryConform/>
+      </item>
+      <item value="0x47" name="Record">
+        <mandatoryConform/>
+      </item>
+      <item value="0x48" name="Rewind">
+        <mandatoryConform/>
+      </item>
+      <item value="0x49" name="FastForward">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4A" name="Eject">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4B" name="Forward">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4C" name="Backward">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4D" name="StopRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4E" name="PauseRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4F" name="Reserved">
+        <mandatoryConform/>
+      </item>
+      <item value="0x50" name="Angle">
+        <mandatoryConform/>
+      </item>
+      <item value="0x51" name="SubPicture">
+        <mandatoryConform/>
+      </item>
+      <item value="0x52" name="VideoOnDemand">
+        <mandatoryConform/>
+      </item>
+      <item value="0x53" name="ElectronicProgramGuide">
+        <mandatoryConform/>
+      </item>
+      <item value="0x54" name="TimerProgramming">
+        <mandatoryConform/>
+      </item>
+      <item value="0x55" name="InitialConfiguration">
+        <mandatoryConform/>
+      </item>
+      <item value="0x56" name="SelectBroadcastType">
+        <mandatoryConform/>
+      </item>
+      <item value="0x57" name="SelectSoundPresentation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x60" name="PlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x61" name="PausePlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x62" name="RecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x63" name="PauseRecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x64" name="StopFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x65" name="MuteFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x66" name="RestoreVolumeFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x67" name="TuneFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x68" name="SelectMediaFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x69" name="SelectAvInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x6A" name="SelectAudioInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x6B" name="PowerToggleFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x6C" name="PowerOffFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x6D" name="PowerOnFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="0x71" name="F1Blue">
+        <mandatoryConform/>
+      </item>
+      <item value="0x72" name="F2Red">
+        <mandatoryConform/>
+      </item>
+      <item value="0x73" name="F3Green">
+        <mandatoryConform/>
+      </item>
+      <item value="0x74" name="F4Yellow">
+        <mandatoryConform/>
+      </item>
+      <item value="0x75" name="F5">
+        <mandatoryConform/>
+      </item>
+      <item value="0x76" name="Data">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UnsupportedKey" summary="Key code is not supported.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidKeyInCurrentState" summary="Requested key code is invalid in the context of the responder&apos;s current state.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="SendKey" direction="commandToServer" response="SendKeyResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="KeyCode" type="CecKeyCodeEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="SendKeyResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Label-Cluster.xml b/data_model/1.6/clusters/Label-Cluster.xml
new file mode 100644
index 00000000000..e116355b67e
--- /dev/null
+++ b/data_model/1.6/clusters/Label-Cluster.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Label Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId name="Label"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="LABEL" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="LabelStruct">
+      <field id="0" name="Label" type="string" default="empty">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="Value" type="string" default="empty">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list">
+      <entry type="LabelStruct"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LaundryDryerControls.xml b/data_model/1.6/clusters/LaundryDryerControls.xml
new file mode 100644
index 00000000000..37cf87d481b
--- /dev/null
+++ b/data_model/1.6/clusters/LaundryDryerControls.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x004A" name="Laundry Dryer Controls Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x004A" name="Laundry Dryer Controls"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="DRYERCTRL" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="DrynessLevelEnum">
+      <item value="0" name="Low" summary="Provides a low dryness level for the selected mode">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Normal" summary="Provides the normal level of dryness for the selected mode">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Extra" summary="Provides an extra dryness level for the selected mode">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Max" summary="Provides the max dryness level for the selected mode">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedDrynessLevels" type="list">
+      <entry type="DrynessLevelEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="4"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SelectedDrynessLevel" type="DrynessLevelEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LaundryWasherControls.xml b/data_model/1.6/clusters/LaundryWasherControls.xml
new file mode 100644
index 00000000000..00cc966b119
--- /dev/null
+++ b/data_model/1.6/clusters/LaundryWasherControls.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0053" name="Laundry Washer Controls Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Updated Feature Map Conformance"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0053" name="Laundry Washer Controls"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WASHERCTRL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SPIN" name="Spin" summary="Multiple spin speeds supported">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="RINSE" name="Rinse" summary="Multiple rinse cycles supported">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="NumberOfRinsesEnum">
+      <item value="0" name="None" summary="This laundry washer mode does not perform rinse cycles">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Normal" summary="This laundry washer mode performs normal rinse cycles determined by the manufacturer">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Extra" summary="This laundry washer mode performs an extra rinse cycle">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Max" summary="This laundry washer mode performs the maximum number of rinse cycles determined by the manufacturer">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SpinSpeeds" type="list">
+      <entry type="string">
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SPIN"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SpinSpeedCurrent" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="SPIN"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="15"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="NumberOfRinses" type="NumberOfRinsesEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RINSE"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="SupportedRinses" type="list">
+      <entry type="NumberOfRinsesEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RINSE"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="4"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LevelControl.xml b/data_model/1.6/clusters/LevelControl.xml
new file mode 100644
index 00000000000..0e1214fb52a
--- /dev/null
+++ b/data_model/1.6/clusters/LevelControl.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0008" name="Level Control Cluster" revision="7">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Added Options attribute, state change table; ZLO 1.0; Base cluster (no change) CCB 2085 1775 2281 2147"/>
+    <revision revision="3" summary="CCB 2574 2616 2659 2702 2814 2818 2819 2898"/>
+    <revision revision="4" summary="FeatureMap support with On/Off, Lighting and Frequency features"/>
+    <revision revision="5" summary="New data model format and notation"/>
+    <revision revision="6" summary="Added Q quality for CurrentLevel, CurrentFrequency and RemainingTime attributes, added clarifications for behavior related to Step value and adjusted constraint of DefaultMoveRate"/>
+    <revision revision="7" summary="Simplify constraint, added F quality, changed the conformance to mandatory for MinLevel and MaxLevel, and removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0008" name="Level Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="LVL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="OO" name="OnOff" summary="Dependency with the On/Off cluster">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LT" name="Lighting" summary="Behavior that supports lighting applications">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="FQ" name="Frequency" summary="Supports frequency attributes and behavior.">
+      <provisionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MoveModeEnum">
+      <item value="0" name="Up" summary="Increase the level">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Down" summary="Decrease the level">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StepModeEnum">
+      <item value="0" name="Up" summary="Step upwards">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Down" summary="Step downwards">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OptionsBitmap">
+      <bitfield name="ExecuteIfOff" bit="0" summary="Dependency on On/Off cluster">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LT"/>
+            <feature name="OO"/>
+          </orTerm>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="CoupleColorTempToLevel" bit="1" summary="Dependency on Color Control cluster">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentLevel" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" scene="true" persistence="nonVolatile" quieterReporting="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinLevel"/>
+          </from>
+          <to>
+            <attribute name="MaxLevel"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="RemainingTime" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="MinLevel" type="uint8" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="7"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <max value="254"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="MaxLevel" type="uint8" default="254">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="7"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinLevel"/>
+          </from>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="CurrentFrequency" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinFrequency"/>
+          </from>
+          <to>
+            <attribute name="MaxFrequency"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="MinFrequency" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="MaxFrequency" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <constraint>
+        <min>
+          <attribute name="MinFrequency"/>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="Options" type="OptionsBitmap">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="OnOffTransitionTime" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0011" name="OnLevel" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinLevel"/>
+          </from>
+          <to>
+            <attribute name="MaxLevel"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="OnTransitionTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0013" name="OffTransitionTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0014" name="DefaultMoveRate" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x4000" name="StartUpCurrentLevel" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="MoveToLevel" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Level" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="Move" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="Step" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="StepMode" type="StepModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="Stop" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="OptionsMask" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="OptionsOverride" type="OptionsBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="MoveToLevelWithOnOff" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="MoveWithOnOff" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x06" name="StepWithOnOff" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x07" name="StopWithOnOff" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x08" name="MoveToClosestFrequency" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <field id="0" name="Frequency" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/LocalizationConfiguration.xml b/data_model/1.6/clusters/LocalizationConfiguration.xml
new file mode 100644
index 00000000000..02860ea80d4
--- /dev/null
+++ b/data_model/1.6/clusters/LocalizationConfiguration.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002B" name="Localization Configuration Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002B" name="Localization Configuration"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="LCFG" scope="Node"/>
+  <attributes>
+    <attribute id="0x0000" name="ActiveLocale" type="string" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="35"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SupportedLocales" type="list" default="MS">
+      <entry type="string">
+        <constraint>
+          <maxLength value="35"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="32"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LocalizationTimeFormat.xml b/data_model/1.6/clusters/LocalizationTimeFormat.xml
new file mode 100644
index 00000000000..946d553194d
--- /dev/null
+++ b/data_model/1.6/clusters/LocalizationTimeFormat.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002C" name="Time Format Localization Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002C" name="Time Format Localization"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="LTIME" scope="Node"/>
+  <features>
+    <feature bit="0" code="CALFMT" name="CalendarFormat" summary="The Node can be configured to use different calendar formats when conveying values to a user.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CalendarTypeEnum">
+      <item value="0" name="Buddhist" summary="Dates conveyed using the Buddhist calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="1" name="Chinese" summary="Dates conveyed using the Chinese calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="2" name="Coptic" summary="Dates conveyed using the Coptic calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="3" name="Ethiopian" summary="Dates conveyed using the Ethiopian calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="4" name="Gregorian" summary="Dates conveyed using the Gregorian calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="5" name="Hebrew" summary="Dates conveyed using the Hebrew calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="6" name="Indian" summary="Dates conveyed using the Indian calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="7" name="Islamic" summary="Dates conveyed using the Islamic calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="8" name="Japanese" summary="Dates conveyed using the Japanese calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="9" name="Korean" summary="Dates conveyed using the Korean calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="10" name="Persian" summary="Dates conveyed using the Persian calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="11" name="Taiwanese" summary="Dates conveyed using the Taiwanese calendar">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+      <item value="255" name="UseActiveLocale" summary="calendar implied from active locale">
+        <optionalConform choice="a" more="true" min="1"/>
+      </item>
+    </enum>
+    <enum name="HourFormatEnum">
+      <item value="0" name="12hr" summary="Time conveyed with a 12-hour clock">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="24hr" summary="Time conveyed with a 24-hour clock">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="UseActiveLocale" summary="Use active locale clock">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CALFMT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="SupportedCalendarTypes" type="list">
+      <entry type="CalendarTypeEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="CALFMT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LocalizationUnit.xml b/data_model/1.6/clusters/LocalizationUnit.xml
new file mode 100644
index 00000000000..8e1d50a5a5c
--- /dev/null
+++ b/data_model/1.6/clusters/LocalizationUnit.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002D" name="Unit Localization Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added SupportedTemperatureUnits attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002D" name="Unit Localization"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="LUNIT" scope="Node"/>
+  <features>
+    <feature bit="0" code="TEMP" name="TemperatureUnit" summary="The Node can be configured to use different units of temperature when conveying values to a user.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="TempUnitEnum">
+      <item value="0" name="Fahrenheit" summary="Temperature conveyed in Fahrenheit">
+        <optionalConform choice="a" more="true" min="2"/>
+      </item>
+      <item value="1" name="Celsius" summary="Temperature conveyed in Celsius">
+        <optionalConform choice="a" more="true" min="2"/>
+      </item>
+      <item value="2" name="Kelvin" summary="Temperature conveyed in Kelvin">
+        <optionalConform choice="a" more="true" min="2"/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TemperatureUnit" type="TempUnitEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TEMP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="SupportedTemperatureUnits" type="list">
+      <entry type="TempUnitEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TEMP"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="2"/>
+          <to value="3"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/LowPower.xml b/data_model/1.6/clusters/LowPower.xml
new file mode 100644
index 00000000000..f92019ed2b9
--- /dev/null
+++ b/data_model/1.6/clusters/LowPower.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0508" name="Low Power Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0508" name="Low Power"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="LOWPOWER" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="Sleep" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/MediaInput.xml b/data_model/1.6/clusters/MediaInput.xml
new file mode 100644
index 00000000000..1a60d075716
--- /dev/null
+++ b/data_model/1.6/clusters/MediaInput.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0507" name="Media Input Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0507" name="Media Input"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MEDIAINPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to the input names">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="InputTypeEnum">
+      <item value="0" name="Internal" summary="Indicates content not coming from a physical input.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Aux">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Coax">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Composite">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="HDMI">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Input">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Line">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Optical">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Video">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="SCART">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="USB">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Other">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="InputInfoStruct">
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InputType" type="InputTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Description" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="InputList" type="list">
+      <entry type="InputInfoStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentInput" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelectInput" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ShowInputStatus" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="HideInputStatus" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x03" name="RenameInput" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="NU"/>
+      </mandatoryConform>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/MediaPlayback.xml b/data_model/1.6/clusters/MediaPlayback.xml
new file mode 100644
index 00000000000..8971950ddb4
--- /dev/null
+++ b/data_model/1.6/clusters/MediaPlayback.xml
@@ -0,0 +1,525 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0506" name="Media Playback Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Text/Audio tracks support, Audio-while-advancing (AA) feature, StateChanged event"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0506" name="Media Playback"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MEDIAPLAYBACK" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="AS" name="AdvancedSeek" summary="Advanced media seeking">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="VS" name="VariableSpeed" summary="Variable speed playback">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="TT" name="TextTracks" summary="Text Tracks">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="AT" name="AudioTracks" summary="Audio Tracks">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="AA" name="AudioAdvance" summary="Can play audio during fast and slow playback speeds">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CharacteristicEnum">
+      <item value="0" name="ForcedSubtitles" summary="Textual information meant for display when no other text representation is selected. It is used to clarify dialogue, alternate languages, texted graphics or location/person IDs that are not otherwise covered in the dubbed/localized audio.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DescribesVideo" summary="Textual or audio media component containing a textual description (intended for audio synthesis) or an audio description describing a visual component">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="EasyToRead" summary="Simplified or reduced captions as specified in [United States Code Title 47 CFR 79.103(c)(9)].">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="FrameBased" summary="A media characteristic that indicates that a track selection option includes frame-based content.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="MainProgram" summary="Main media component(s) which is/are intended for presentation if no other information is provided">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="OriginalContent" summary="A media characteristic that indicates that a track or media selection option contains original content.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="VoiceOverTranslation" summary="A media characteristic that indicates that a track or media selection option contains a language translation and verbal interpretation of spoken dialog.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Caption" summary="Textual media component containing transcriptions of spoken dialog and auditory cues such as sound effects and music for the hearing impaired.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Subtitle" summary="Textual transcriptions of spoken dialog.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Alternate" summary="Textual media component containing transcriptions of spoken dialog and auditory cues such as sound effects and music for the hearing impaired.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Supplementary" summary="Media content component that is supplementary to a media content component of a different media component type.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Commentary" summary="Experience that contains a commentary (e.g. director’s commentary) (typically audio)">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="DubbedTranslation" summary="Experience that contains an element that is presented in a different language from the original (e.g. dubbed audio, translated captions)">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Description" summary="Textual or audio media component containing a textual description (intended for audio synthesis) or an audio description describing a visual component">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="Metadata" summary="Media component containing information intended to be processed by application specific elements.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="EnhancedAudioIntelligibility" summary="Experience containing an element for improved intelligibility of the dialogue.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="Emergency" summary="Experience that provides information, about a current emergency, that is intended to enable the protection of life, health, safety, and property, and may also include critical details regarding the emergency and how to respond to the emergency.">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="Karaoke" summary="Textual representation of a songs’ lyrics, usually in the same language as the associated song as specified in [SMPTE ST 2067-2].">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PlaybackStateEnum">
+      <item value="0" name="Playing" summary="Media is currently playing (includes FF and REW)">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Paused" summary="Media is currently paused">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotPlaying" summary="Media is not currently playing">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Buffering" summary="Media is not currently buffering and playback will start when buffer has been filled">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="InvalidStateForCommand" summary="Requested playback command is invalid in the current playback state.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotAllowed" summary="Requested playback command is not allowed in the current playback state. For example, attempting to fast-forward during a commercial might return NotAllowed.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NotActive" summary="This endpoint is not active for playback.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="SpeedOutOfRange" summary="The FastForward or Rewind Command was issued but the media is already playing back at the fastest speed supported by the server in the respective direction.">
+        <mandatoryConform>
+          <feature name="VS"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="SeekOutOfRange" summary="The Seek Command was issued with a value of position outside of the allowed seek range of the media.">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="PlaybackPositionStruct">
+      <field id="0" name="UpdatedAt" type="epoch-us">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Position" type="uint64">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TrackAttributesStruct">
+      <field id="0" name="LanguageCode" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="Characteristics" type="list" default="null">
+        <entry type="CharacteristicEnum"/>
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="DisplayName" type="string" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TrackStruct">
+      <field id="0" name="ID" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="TrackAttributes" type="TrackAttributesStruct">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentState" type="PlaybackStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="StartTime" type="epoch-us" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="Duration" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="SampledPosition" type="PlaybackPositionStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="PlaybackSpeed" type="single" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="SeekRangeEnd" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="SeekRangeStart" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="ActiveAudioTrack" type="TrackStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="AvailableAudioTracks" type="list" default="null">
+      <entry type="TrackStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="AT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="ActiveTextTrack" type="TrackStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="TT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000A" name="AvailableTextTracks" type="list" default="null">
+      <entry type="TrackStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="TT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Play" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="Pause" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="Stop" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x03" name="StartOver" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x04" name="Previous" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x05" name="Next" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x06" name="Rewind" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="VS"/>
+      </mandatoryConform>
+      <field id="0" name="AudioAdvanceUnmuted" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="AA"/>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x07" name="FastForward" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="VS"/>
+      </mandatoryConform>
+      <field id="0" name="AudioAdvanceUnmuted" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="AA"/>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x08" name="SkipForward" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="DeltaPositionMilliseconds" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x09" name="SkipBackward" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="DeltaPositionMilliseconds" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0A" name="PlaybackResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x0B" name="Seek" direction="commandToServer" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <field id="0" name="Position" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0C" name="ActivateAudioTrack" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="AT"/>
+      </mandatoryConform>
+      <field id="0" name="TrackID" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="AudioOutputIndex" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="AT"/>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x0D" name="ActivateTextTrack" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="TT"/>
+      </mandatoryConform>
+      <field id="0" name="TrackID" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0E" name="DeactivateTextTrack" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="TT"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="StateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="CurrentState" type="PlaybackStateEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="StartTime" type="epoch-us">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Duration" type="uint64">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="SampledPosition" type="PlaybackPositionStruct">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="PlaybackSpeed" type="single">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="SeekRangeEnd" type="uint64">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="6" name="SeekRangeStart" type="uint64">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="7" name="Data" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="900"/>
+        </constraint>
+      </field>
+      <field id="8" name="AudioAdvanceUnmuted" type="bool" default="false">
+        <mandatoryConform>
+          <feature name="AA"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/Messages.xml b/data_model/1.6/clusters/Messages.xml
new file mode 100644
index 00000000000..186e4cf81a6
--- /dev/null
+++ b/data_model/1.6/clusters/Messages.xml
@@ -0,0 +1,328 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0097" name="Messages Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Updated from SE1.4 version; CCB 1819"/>
+    <revision revision="3" summary="Initial Matter release; renamed from EnergyMessaging to Messages"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0097" name="Messages"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MESS" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CONF" name="ReceivedConfirmation">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="RESP" name="ConfirmationResponse">
+      <optionalConform>
+        <feature name="CONF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="2" code="RPLY" name="ConfirmationReply">
+      <optionalConform>
+        <feature name="CONF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="PROT" name="ProtectedMessages">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="FutureMessagePreferenceEnum">
+      <item value="0" name="Allowed" summary="Similar messages are allowed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Increased" summary="Similar messages should be sent more often">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Reduced" summary="Similar messages should be sent less often">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Disallowed" summary="Similar messages should not be sent">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Banned" summary="No further messages should be sent">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MessagePriorityEnum">
+      <item value="0" name="Low" summary="Message to be transferred with a low level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Medium" summary="Message to be transferred with a medium level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="High" summary="Message to be transferred with a high level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Critical" summary="Message to be transferred with a critical level of importance">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="MessageControlBitmap">
+      <bitfield name="ConfirmationRequired" bit="0" summary="Message requires confirmation from user">
+        <mandatoryConform>
+          <feature name="CONF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ResponseRequired" bit="1" summary="Message requires response from user">
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ReplyMessage" bit="2" summary="Message supports reply message from user">
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="MessageConfirmed" bit="3" summary="Message has already been confirmed">
+        <mandatoryConform>
+          <feature name="CONF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="MessageProtected" bit="4" summary="Message required PIN/password protection">
+        <mandatoryConform>
+          <feature name="PROT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <struct name="MessageResponseOptionStruct">
+      <field id="0" name="MessageResponseID" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="Label" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="MessageStruct">
+      <field id="0" name="MessageID" type="message-id">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="Priority" type="MessagePriorityEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MessageControl" type="MessageControlBitmap">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StartTime" type="epoch-s">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Duration" type="uint64">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MessageText" type="string">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="6" name="Responses" type="list">
+        <entry type="MessageResponseOptionStruct"/>
+        <access fabricSensitive="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Messages" type="list">
+      <entry type="MessageStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ActiveMessageIDs" type="list">
+      <entry type="message-id"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="8"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="PresentMessagesRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="message-id">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="Priority" type="MessagePriorityEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MessageControl" type="MessageControlBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StartTime" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Duration" type="uint64">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MessageText" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="6" name="Responses" type="list">
+        <entry type="MessageResponseOptionStruct"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+        <constraint>
+          <maxCount value="4"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="CancelMessagesRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageIDs" type="list">
+        <entry type="message-id"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="MessageQueued" priority="info">
+      <access readPrivilege="view" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="message-id">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x01" name="MessagePresented" priority="info">
+      <access readPrivilege="view" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="message-id">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x02" name="MessageComplete" priority="info">
+      <access readPrivilege="view" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="message-id">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="ResponseID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Reply" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="3" name="FutureMessagesPreference" type="FutureMessagePreferenceEnum">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/MeterIdentification.xml b/data_model/1.6/clusters/MeterIdentification.xml
new file mode 100644
index 00000000000..ebb0bcf7e78
--- /dev/null
+++ b/data_model/1.6/clusters/MeterIdentification.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B06" name="Meter Identification Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0B06" name="Meter Identification"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MeterTypeEnum">
+      <item value="0x00" name="Utility" summary="Utility Meter">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Private" summary="Private Meter">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Generic" summary="Generic Meter">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeterType" type="MeterTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="PointOfDelivery" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MeterSerialNumber" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="ProtocolVersion" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="PowerThreshold" type="PowerThresholdStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="PWRTHLD"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/MicrowaveOvenControl.xml b/data_model/1.6/clusters/MicrowaveOvenControl.xml
new file mode 100644
index 00000000000..11ade34f267
--- /dev/null
+++ b/data_model/1.6/clusters/MicrowaveOvenControl.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005F" name="Microwave Oven Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005F" name="Microwave Oven Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MWOCTRL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PWRNUM" name="PowerAsNumber" summary="Power is specified as a unitless number or a percentage">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="WATTS" name="PowerInWatts" summary="Power is specified in Watts">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform choice="a"/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="PWRLMTS" name="PowerNumberLimits" summary="Supports the limit attributes used with the PWRNUM feature">
+      <optionalConform>
+        <feature name="PWRNUM"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="CookTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to>
+            <attribute name="MaxCookTime"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MaxCookTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="86400"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="PowerSetting" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PWRNUM"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="MinPower" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PWRLMTS"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="99"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="MaxPower" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PWRLMTS"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <attribute name="MinPower"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </from>
+          <to value="100"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="PowerStep" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PWRLMTS"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="SupportedWatts" type="list">
+      <entry type="uint16"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="WATTS"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="10"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="SelectedWattIndex" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="WATTS"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="WattRating" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetCookingParameters" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="CookMode" type="uint8" default="desc">
+        <optionalConform choice="b" more="true" min="1"/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="CookTime" type="elapsed-s" default="30">
+        <optionalConform choice="b" more="true" min="1"/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxCookTime"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="PowerSetting" type="uint8">
+        <default>
+          <attribute name="MaxPower"/>
+        </default>
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="PWRNUM"/>
+        </optionalConform>
+        <constraint>
+          <between>
+            <from>
+              <attribute name="MinPower"/>
+            </from>
+            <to>
+              <attribute name="MaxPower"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="WattSettingIndex" type="uint8" default="MS">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="WATTS"/>
+        </optionalConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="StartAfterSetting" type="bool" default="false">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="AddMoreTime" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="TimeToAdd" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxCookTime"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ModeBase.xml b/data_model/1.6/clusters/ModeBase.xml
new file mode 100644
index 00000000000..f0fb5498f67
--- /dev/null
+++ b/data_model/1.6/clusters/ModeBase.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Mode Base Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Require at least one standard mode tag. Define reserved ranges for base/derived clusters"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId name="Mode Base"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MODB" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label" type="string">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="1" name="Mode" type="uint8">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags" type="list">
+        <entry type="ModeTagStruct"/>
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ModeTagStruct">
+      <field id="0" name="MfgCode" type="vendor-id">
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Value" type="enum16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes" type="list">
+      <entry type="ModeOptionStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="2"/>
+          <to value="255"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="OnMode" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="DEPONOFF"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeToMode" direction="commandToServer" response="ChangeToModeResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NewMode" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ChangeToModeResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="StatusText" type="string">
+        <otherwiseConform>
+          <optionalConform>
+            <equalTerm>
+              <field name="Status"/>
+              <status name="SUCCESS"/>
+            </equalTerm>
+          </optionalConform>
+          <mandatoryConform/>
+        </otherwiseConform>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ModeSelect.xml b/data_model/1.6/clusters/ModeSelect.xml
new file mode 100644
index 00000000000..32ce055135f
--- /dev/null
+++ b/data_model/1.6/clusters/ModeSelect.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0050" name="Mode Select Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="The MfgCode field was marked non-nullable. Updated the related text. Reorder sections."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0050" name="Mode Select"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="MOD" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label" type="string" default="MS">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="1" name="Mode" type="uint8" default="MS">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SemanticTags" type="list" default="MS">
+        <entry type="SemanticTagStruct"/>
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="64"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SemanticTagStruct">
+      <field id="0" name="MfgCode" type="vendor-id">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Value" type="enum16">
+        <quality persistence="fixed"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Description" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="StandardNamespace" type="enum16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="SupportedModes" type="list" default="MS">
+      <entry type="ModeOptionStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="CurrentMode" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="StartUpMode" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="OnMode" type="uint8" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="DEPONOFF"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeToMode" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NewMode" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_DeviceEnergyManagement.xml b/data_model/1.6/clusters/Mode_DeviceEnergyManagement.xml
new file mode 100644
index 00000000000..0dce72ebf11
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_DeviceEnergyManagement.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009F" name="Device Energy Management Mode Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Disallowed DEPONOFF feature and OnMode and StartUpMode attributes"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x009F" name="Device Energy Management Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DEMM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="NoOptimization"/>
+      <item value="0x4001" name="DeviceOptimization"/>
+      <item value="0x4002" name="LocalOptimization"/>
+      <item value="0x4003" name="GridOptimization"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_Dishwasher.xml b/data_model/1.6/clusters/Mode_Dishwasher.xml
new file mode 100644
index 00000000000..6ded4ff2d51
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_Dishwasher.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0059" name="Dishwasher Mode Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+    <revision revision="3" summary="Set OnOff feature as disallowed (previously a Device Type override), Set StartUpMode and OnMode as disallowed (previously provisional)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0059" name="Dishwasher Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DISHM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Normal"/>
+      <item value="0x4001" name="Heavy"/>
+      <item value="0x4002" name="Light"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_EVSE.xml b/data_model/1.6/clusters/Mode_EVSE.xml
new file mode 100644
index 00000000000..2571699e619
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_EVSE.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009D" name="Energy EVSE Mode Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Disallowed DEPONOFF feature and OnMode and StartUpMode attributes"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x009D" name="Energy EVSE Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="EEVSEM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Manual"/>
+      <item value="0x4001" name="TimeOfUse"/>
+      <item value="0x4002" name="SolarCharging"/>
+      <item value="0x4003" name="V2X"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_LaundryWasher.xml b/data_model/1.6/clusters/Mode_LaundryWasher.xml
new file mode 100644
index 00000000000..7c1262bb8f3
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_LaundryWasher.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Washer Mode Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+    <revision revision="3" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0051" name="Laundry Washer Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="LWM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Normal"/>
+      <item value="0x4001" name="Delicate"/>
+      <item value="0x4002" name="Heavy"/>
+      <item value="0x4003" name="Whites"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_MicrowaveOven.xml b/data_model/1.6/clusters/Mode_MicrowaveOven.xml
new file mode 100644
index 00000000000..e8c7f8a0145
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_MicrowaveOven.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005E" name="Microwave Oven Mode Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Set OnOff feature as disallowed"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005E" name="Microwave Oven Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="MWOM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Normal"/>
+      <item value="0x4001" name="Defrost"/>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeToMode">
+      <disallowConform/>
+    </command>
+    <command id="0x01" name="ChangeToModeResponse">
+      <disallowConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_Oven.xml b/data_model/1.6/clusters/Mode_Oven.xml
new file mode 100644
index 00000000000..669560acb02
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_Oven.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0049" name="Oven Mode Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0049" name="Oven Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="OTCCM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Bake"/>
+      <item value="0x4001" name="Convection"/>
+      <item value="0x4002" name="Grill"/>
+      <item value="0x4003" name="Roast"/>
+      <item value="0x4004" name="Clean"/>
+      <item value="0x4005" name="Convection Bake"/>
+      <item value="0x4006" name="Convection Roast"/>
+      <item value="0x4007" name="Warming"/>
+      <item value="0x4008" name="Proofing"/>
+      <item value="0x4009" name="Steam"/>
+      <item value="0x400A" name="Air Fry"/>
+      <item value="0x400B" name="Air Sous Vide"/>
+      <item value="0x400C" name="Frozen Food"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_RVCClean.xml b/data_model/1.6/clusters/Mode_RVCClean.xml
new file mode 100644
index 00000000000..3a27a4f7702
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_RVCClean.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0055" name="RVC Clean Mode Cluster" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add constraint about changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit."/>
+    <revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
+    <revision revision="4" summary="Add Vacuum then Mop cleaning mode"/>
+    <revision revision="5" summary="DirectModeChange made non-provisional"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0055" name="RVC Clean Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCCLEANM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+    <feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing clean modes from non-Idle states">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="DeepClean"/>
+      <item value="0x4001" name="Vacuum"/>
+      <item value="0x4002" name="Mop"/>
+      <item value="0x4003" name="Vacuum then Mop"/>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x40" name="CleaningInProgress">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_RVCRun.xml b/data_model/1.6/clusters/Mode_RVCRun.xml
new file mode 100644
index 00000000000..e4c4540ba42
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_RVCRun.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0054" name="RVC Run Mode Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add constraint about switching from non-Idle to non-Idle modes. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit. Add the Mapping mode tag."/>
+    <revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
+    <revision revision="4" summary="DirectModeChange made non-provisional"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0054" name="RVC Run Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCRUNM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+    <feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing run modes from non-Idle states">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Idle"/>
+      <item value="0x4001" name="Cleaning"/>
+      <item value="0x4002" name="Mapping"/>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x41" name="Stuck">
+        <mandatoryConform/>
+      </item>
+      <item value="0x42" name="DustBinMissing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x43" name="DustBinFull">
+        <mandatoryConform/>
+      </item>
+      <item value="0x44" name="WaterTankEmpty">
+        <mandatoryConform/>
+      </item>
+      <item value="0x45" name="WaterTankMissing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x46" name="WaterTankLidOpen">
+        <mandatoryConform/>
+      </item>
+      <item value="0x47" name="MopCleaningPadMissing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x48" name="BatteryLow">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_Refrigerator.xml b/data_model/1.6/clusters/Mode_Refrigerator.xml
new file mode 100644
index 00000000000..49ac574a03c
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_Refrigerator.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+    <revision revision="3" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="TCCM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="RapidCool"/>
+      <item value="0x4001" name="RapidFreeze"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Mode_WaterHeater.xml b/data_model/1.6/clusters/Mode_WaterHeater.xml
new file mode 100644
index 00000000000..b5ba06b62ad
--- /dev/null
+++ b/data_model/1.6/clusters/Mode_WaterHeater.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009E" name="Water Heater Mode Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x009E" name="Water Heater Mode"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="WHM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ModeTag">
+      <item value="0x00" name="Auto"/>
+      <item value="0x01" name="Quick"/>
+      <item value="0x02" name="Quiet"/>
+      <item value="0x03" name="LowNoise"/>
+      <item value="0x04" name="LowEnergy"/>
+      <item value="0x05" name="Vacation"/>
+      <item value="0x06" name="Min"/>
+      <item value="0x07" name="Max"/>
+      <item value="0x08" name="Night"/>
+      <item value="0x09" name="Day"/>
+      <item value="0x4000" name="Off"/>
+      <item value="0x4001" name="Manual"/>
+      <item value="0x4002" name="Timed"/>
+    </enum>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="8"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes"/>
+    <attribute id="0x0001" name="CurrentMode"/>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/NetworkCommissioningCluster.xml b/data_model/1.6/clusters/NetworkCommissioningCluster.xml
new file mode 100644
index 00000000000..2aafb791546
--- /dev/null
+++ b/data_model/1.6/clusters/NetworkCommissioningCluster.xml
@@ -0,0 +1,708 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements."/>
+    <revision revision="3" summary="Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and QueryIdentityResponse commands; PDC-related fields in commands)."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0031" name="Network Commissioning"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="CNET" scope="Node"/>
+  <features>
+    <feature bit="0" code="WI" name="WiFiNetworkInterface" summary="Wi-Fi related features">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TH" name="ThreadNetworkInterface" summary="Thread related features">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="ET" name="EthernetNetworkInterface" summary="Ethernet related features">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="3" code="PDC" name="PerDeviceCredentials" summary="Wi-Fi Per-Device Credentials">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="NetworkCommissioningStatusEnum">
+      <item value="0" name="Success" summary="OK, no error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OutOfRange" summary="Value Outside Range">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BoundsExceeded" summary="A collection would exceed its size limit">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NetworkIDNotFound" summary="The NetworkID is not among the collection of added networks">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="DuplicateNetworkID" summary="The NetworkID is already among the collection of added networks">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="NetworkNotFound" summary="Cannot find AP: SSID Not found">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="RegulatoryError" summary="Cannot find AP: Mismatch on band/channels/regulatory domain / 2.4GHz vs 5GHz">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="AuthFailure" summary="Cannot associate due to authentication failure">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="UnsupportedSecurity" summary="Cannot associate due to unsupported security mode">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="OtherConnectionFailure" summary="Other association failure">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="IPV6Failed" summary="Failure to generate an IPv6 address">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="IPBindFailed" summary="Failure to bind Wi-Fi +&lt;-&gt;+ IP interfaces">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="UnknownError" summary="Unknown error">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiFiBandEnum">
+      <item value="0" name="2G4" summary="2.4GHz - 2.401GHz to 2.495GHz (802.11b/g/n/ax)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+      <item value="1" name="3G65" summary="3.65GHz - 3.655GHz to 3.695GHz (802.11y)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+      <item value="2" name="5G" summary="5GHz - 5.150GHz to 5.895GHz (802.11a/n/ac/ax)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / Wi-Fi 6E)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+      <item value="4" name="60G" summary="60GHz - 57.24GHz to 70.20GHz (802.11ad/ay)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+      <item value="5" name="1G" summary="Sub-1GHz - 755MHz to 931MHz (802.11ah)">
+        <optionalConform choice="b" more="true" min="1"/>
+      </item>
+    </enum>
+    <bitmap name="ThreadCapabilitiesBitmap">
+      <bitfield name="IsBorderRouterCapable" bit="0" summary="Thread Border Router functionality is present">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsRouterCapable" bit="1" summary="Router mode is supported (interface could be in router or REED mode)">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsSleepyEndDeviceCapable" bit="2" summary="Sleepy end-device mode is supported">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsFullThreadDevice" bit="3" summary="Device is a full Thread device (opposite of Minimal Thread Device)">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsSynchronizedSleepyEndDeviceCapable" bit="4" summary="Synchronized sleepy end-device mode is supported">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="WiFiSecurityBitmap">
+      <bitfield name="Unencrypted" bit="0" summary="Supports unencrypted Wi-Fi">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WEP" bit="1" summary="Supports Wi-Fi using WEP security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA-PERSONAL" bit="2" summary="Supports Wi-Fi using WPA-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA2-PERSONAL" bit="3" summary="Supports Wi-Fi using WPA2-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA3-PERSONAL" bit="4" summary="Supports Wi-Fi using WPA3-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA3-Matter-PDC" bit="5" summary="Supports Wi-Fi using Per-Device Credentials">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+    </bitmap>
+    <struct name="NetworkInfoStruct">
+      <field id="0" name="NetworkID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="Connected" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NetworkIdentifier" type="octstr" default="null">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <feature name="PDC"/>
+          </mandatoryConform>
+        </otherwiseConform>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+      <field id="3" name="ClientIdentifier" type="octstr" default="null">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <feature name="PDC"/>
+          </mandatoryConform>
+        </otherwiseConform>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ThreadInterfaceScanResultStruct">
+      <field id="0" name="PanId" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="65534"/>
+        </constraint>
+      </field>
+      <field id="1" name="ExtendedPanId" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NetworkName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="3" name="Channel" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Version" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="ExtendedAddress" type="hwadr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="6"/>
+        </constraint>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+      </field>
+      <field id="6" name="RSSI" type="int8">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="LQI" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="WiFiInterfaceScanResultStruct">
+      <field id="0" name="Security" type="WiFiSecurityBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SSID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="2" name="BSSID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="6"/>
+        </constraint>
+      </field>
+      <field id="3" name="Channel" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="WiFiBand" type="WiFiBandEnum">
+        <optionalConform/>
+      </field>
+      <field id="5" name="RSSI" type="int8">
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxNetworks" type="uint8">
+      <access read="true" readPrivilege="admin"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="Networks" type="list" default="empty">
+      <entry type="NetworkInfoStruct"/>
+      <access read="true" readPrivilege="admin"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="MaxNetworks"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ScanMaxTimeSeconds" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="ConnectMaxTimeSeconds" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="InterfaceEnabled" type="bool" default="true">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="LastNetworkingStatus" type="NetworkCommissioningStatusEnum" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="LastNetworkID" type="octstr" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="32"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="LastConnectErrorValue" type="int32" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="SupportedWiFiBands" type="list" default="MS">
+      <entry type="WiFiBandEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="WI"/>
+      </mandatoryConform>
+      <constraint>
+        <minCount value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="SupportedThreadFeatures" type="ThreadCapabilitiesBitmap" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="ThreadVersion" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ScanNetworks" direction="commandToServer" response="ScanNetworksResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="SSID" type="octstr" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="WI"/>
+        </optionalConform>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ScanNetworksResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="DebugText" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+      <field id="2" name="WiFiScanResults" type="list">
+        <entry type="WiFiInterfaceScanResultStruct"/>
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="ThreadScanResults" type="list">
+        <entry type="ThreadInterfaceScanResultStruct"/>
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="AddOrUpdateWiFiNetwork" direction="commandToServer" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WI"/>
+      </mandatoryConform>
+      <field id="0" name="SSID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="Credentials" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="2" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+      <field id="3" name="NetworkIdentity" type="octstr">
+        <optionalConform>
+          <feature name="PDC"/>
+        </optionalConform>
+        <constraint>
+          <maxLength value="140"/>
+        </constraint>
+      </field>
+      <field id="4" name="ClientIdentifier" type="octstr">
+        <optionalConform>
+          <field name="NetworkIdentity"/>
+        </optionalConform>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+      <field id="5" name="PossessionNonce" type="octstr">
+        <optionalConform>
+          <field name="NetworkIdentity"/>
+        </optionalConform>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="AddOrUpdateThreadNetwork" direction="commandToServer" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+      <field id="0" name="OperationalDataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x04" name="RemoveNetwork" direction="commandToServer" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="NetworkConfigResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="DebugText" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+      <field id="2" name="NetworkIndex" type="uint8">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="NetworkingStatus"/>
+            <status name="SUCCESS"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left>
+                <attribute name="MaxNetworks"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="3" name="ClientIdentity" type="octstr">
+        <mandatoryConform>
+          <command name="AddOrUpdateWiFiNetwork" field="NetworkIdentity"/>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="140"/>
+        </constraint>
+      </field>
+      <field id="4" name="PossessionSignature" type="octstr">
+        <mandatoryConform>
+          <andTerm>
+            <command name="AddOrUpdateWiFiNetwork" field="NetworkIdentity"/>
+            <command name="AddOrUpdateWiFiNetwork" field="PossessionNonce"/>
+          </andTerm>
+        </mandatoryConform>
+        <constraint>
+          <allowed value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="ConnectNetwork" direction="commandToServer" response="ConnectNetworkResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x07" name="ConnectNetworkResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DebugText" type="string">
+        <optionalConform/>
+      </field>
+      <field id="2" name="ErrorValue" type="int32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x08" name="ReorderNetwork" direction="commandToServer" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="NetworkIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x09" name="QueryIdentity" direction="commandToServer" response="QueryIdentityResponse">
+      <access invokePrivilege="admin"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="PDC"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="KeyIdentifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+      <field id="1" name="PossessionNonce" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="QueryIdentityResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="PDC"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="Identity" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="140"/>
+        </constraint>
+      </field>
+      <field id="1" name="PossessionSignature" type="octstr">
+        <mandatoryConform>
+          <command name="QueryIdentity">
+            <field name="PossessionNonce"/>
+          </command>
+        </mandatoryConform>
+        <constraint>
+          <allowed value="64"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/NetworkIdentityManagement.xml b/data_model/1.6/clusters/NetworkIdentityManagement.xml
new file mode 100644
index 00000000000..d8495dd7b69
--- /dev/null
+++ b/data_model/1.6/clusters/NetworkIdentityManagement.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0450" name="Network Identity Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0450" name="Network Identity Management">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="NETIM" scope="Endpoint"/>
+  <dataTypes>
+    <number name="ClientIndex" type="uint16"/>
+    <number name="NetworkIdentityIndex" type="uint16"/>
+    <enum name="IdentityTypeEnum">
+      <item value="0" name="ECDSA" summary="ECDSA on the elliptic curve secp256r1">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ActiveNetworkIdentityStruct">
+      <field id="0" name="Index" type="NetworkIdentityIndex">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Type" type="IdentityTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Identifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+      <field id="3" name="CreatedTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Current" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="RemainingClients" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ClientStruct">
+      <field id="0" name="ClientIndex" type="ClientIndex">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="2047"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ClientIdentifier" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+      <field id="2" name="NetworkIdentityIndex" type="NetworkIdentityIndex" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ActiveNetworkIdentities" type="list">
+      <entry type="ActiveNetworkIdentityStruct"/>
+      <access read="true" readPrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="4"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="Clients" type="list">
+      <entry type="ClientStruct"/>
+      <access read="true" readPrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="ClientTableSize"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ClientTableSize" type="uint16" default="500">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="500"/>
+          <to value="2047"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddClient" direction="commandToServer" response="AddClientResponse">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ClientIdentity" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="140"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="AddClientResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="ClientIndex" type="ClientIndex">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="2047"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveClient" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ClientIndex" type="ClientIndex">
+        <optionalConform choice="a"/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="2047"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ClientIdentifier" type="octstr">
+        <optionalConform choice="a"/>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="QueryIdentity" direction="commandToServer" response="QueryIdentityResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="NetworkIdentityIndex" type="NetworkIdentityIndex">
+        <optionalConform choice="b"/>
+      </field>
+      <field id="1" name="NetworkIdentityType" type="IdentityTypeEnum">
+        <optionalConform choice="b"/>
+      </field>
+      <field id="2" name="Identifier" type="octstr">
+        <optionalConform choice="b"/>
+        <constraint>
+          <allowed value="20"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="QueryIdentityResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Identity" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x40" name="ImportAdminSecret" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="NetworkAdministratorSharedSecret" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x41" name="ExportAdminSecret" direction="commandToServer" response="ExportAdminSecretResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x42" name="ExportAdminSecretResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="NetworkAdministratorSharedSecret" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/OTAProvider.xml b/data_model/1.6/clusters/OTAProvider.xml
new file mode 100644
index 00000000000..cc1bbb2e2fb
--- /dev/null
+++ b/data_model/1.6/clusters/OTAProvider.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0029" name="OTA Software Update Provider Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0029" name="OTA Software Update Provider"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="OTAP" scope="Node"/>
+  <dataTypes>
+    <enum name="ApplyUpdateActionEnum">
+      <item value="0" name="Proceed" summary="Apply the update.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AwaitNextAction" summary="Wait at least the given delay time.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Discontinue" summary="The OTA Provider is conveying a desire to rescind a previously provided Software Image.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DownloadProtocolEnum">
+      <item value="0" name="BDXSynchronous" summary="Indicates support for synchronous BDX.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BDXAsynchronous" summary="Indicates support for asynchronous BDX.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="HTTPS" summary="Indicates support for HTTPS.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="VendorSpecific" summary="Indicates support for vendor specific protocol.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="UpdateAvailable" summary="Indicates that the OTA Provider has an update available.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Busy" summary="Indicates OTA Provider may have an update, but it is not ready yet.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotAvailable" summary="Indicates that there is definitely no update currently available from the OTA Provider.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="DownloadProtocolNotSupported" summary="Indicates that the requested download protocol is not supported by the OTA Provider.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="QueryImage" direction="commandToServer" response="QueryImageResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ProductID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="ProtocolsSupported" type="list">
+        <entry type="DownloadProtocolEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+      <field id="4" name="HardwareVersion" type="uint16">
+        <optionalConform/>
+      </field>
+      <field id="5" name="Location" type="string">
+        <optionalConform/>
+        <constraint>
+          <allowed value="2"/>
+        </constraint>
+      </field>
+      <field id="6" name="RequestorCanConsent" type="bool" default="false">
+        <optionalConform/>
+      </field>
+      <field id="7" name="MetadataForProvider" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="QueryImageResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DelayedActionTime" type="uint32" default="0">
+        <otherwiseConform>
+          <mandatoryConform>
+            <equalTerm>
+              <field name="Status"/>
+              <enum name="StatusEnum" value="Busy"/>
+            </equalTerm>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="2" name="ImageURI" type="string">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <enum name="StatusEnum" value="UpdateAvailable"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+      <field id="3" name="SoftwareVersion" type="uint32">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <enum name="StatusEnum" value="UpdateAvailable"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="SoftwareVersionString" type="string">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <enum name="StatusEnum" value="UpdateAvailable"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="64"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="5" name="UpdateToken" type="octstr">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <enum name="StatusEnum" value="UpdateAvailable"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <lengthBetween>
+            <from value="8"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="6" name="UserConsentNeeded" type="bool" default="false">
+        <optionalConform/>
+      </field>
+      <field id="7" name="MetadataForRequestor" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="ApplyUpdateRequest" direction="commandToServer" response="ApplyUpdateResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="UpdateToken" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="8"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="NewVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="ApplyUpdateResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Action" type="ApplyUpdateActionEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DelayedActionTime" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="NotifyUpdateApplied" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="UpdateToken" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="8"/>
+            <to value="32"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/OTARequestor.xml b/data_model/1.6/clusters/OTARequestor.xml
new file mode 100644
index 00000000000..5bb76b5e32e
--- /dev/null
+++ b/data_model/1.6/clusters/OTARequestor.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002A" name="OTA Software Update Requestor Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002A" name="OTA Software Update Requestor"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="OTAR" scope="Node"/>
+  <dataTypes>
+    <enum name="AnnouncementReasonEnum">
+      <item value="0" name="SimpleAnnouncement" summary="An OTA Provider is announcing its presence.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UpdateAvailable" summary="An OTA Provider is announcing, either to a single Node or to a group of Nodes, that a new Software Image MAY be available.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UrgentUpdateAvailable" summary="An OTA Provider is announcing, either to a single Node or to a group of Nodes, that a new Software Image MAY be available, which contains an update that needs to be applied urgently.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ChangeReasonEnum">
+      <item value="0" name="Unknown" summary="The reason for a state change is unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Success" summary="The reason for a state change is the success of a prior operation.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Failure" summary="The reason for a state change is the failure of a prior operation.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="TimeOut" summary="The reason for a state change is a time-out.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="DelayByProvider" summary="The reason for a state change is a request by the OTA Provider to wait.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="UpdateStateEnum">
+      <item value="0" name="Unknown" summary="Current state is not yet determined.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Idle" summary="Indicate a Node not yet in the process of software update.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Querying" summary="Indicate a Node in the process of querying an OTA Provider.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="DelayedOnQuery" summary="Indicate a Node waiting after a Busy response.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Downloading" summary="Indicate a Node currently in the process of downloading a software update.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Applying" summary="Indicate a Node currently in the process of verifying and applying a software update.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="DelayedOnApply" summary="Indicate a Node waiting caused by AwaitNextAction response.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="RollingBack" summary="Indicate a Node in the process of recovering to a previous version.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="DelayedOnUserConsent" summary="Indicate a Node is capable of user consent.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ProviderLocation">
+      <field id="1" name="ProviderNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DefaultOTAProviders" type="list" default="empty">
+      <entry type="ProviderLocation"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="UpdatePossible" type="bool" default="true">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="UpdateState" type="UpdateStateEnum">
+      <default>
+        <enum default="Unknown"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="UpdateStateProgress" type="uint8" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="100"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AnnounceOTAProvider" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <optionalConform/>
+      <field id="0" name="ProviderNodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="AnnouncementReason" type="AnnouncementReasonEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="MetadataForNode" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="512"/>
+        </constraint>
+      </field>
+      <field id="4" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="StateTransition" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="PreviousState" type="UpdateStateEnum" default="Unknown">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NewState" type="UpdateStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Reason" type="ChangeReasonEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TargetSoftwareVersion" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="VersionApplied" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ProductID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="DownloadError" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="BytesDownloaded" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ProgressPercent" type="uint8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="100"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="PlatformCode" type="int64" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/OccupancySensing.xml b/data_model/1.6/clusters/OccupancySensing.xml
new file mode 100644
index 00000000000..70ae0287b6e
--- /dev/null
+++ b/data_model/1.6/clusters/OccupancySensing.xml
@@ -0,0 +1,498 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing Cluster" revision="7">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Physical Contact Occupancy feature with mandatory OccupancySensorTypeBitmap"/>
+    <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Remove nullable from PhysicalContact delay attributes and ability to not report transitions"/>
+    <revision revision="5" summary="Rework to add modalities: radar-, ambient-sensing- and vision-based sensors; add sensitivity setting (via co-located BooleanStateConfiguration cluster on same endpoint); add new attribute for tuning the sensor&apos;s reporting; add event OccupancyChanged; add N quality for HoldTime and other timing attributes; describe how to accommodate legacy clients"/>
+    <revision revision="6" summary="Removed P quality"/>
+    <revision revision="7"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0406" name="Occupancy Sensing"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="OCC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="OTHER" name="Other" summary="Supports sensing using a modality not listed in the other bits">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="PIR" name="PassiveInfrared" summary="Supports sensing using PIR (Passive InfraRed)">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="US" name="Ultrasonic" summary="Supports sensing using UltraSound">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="PHY" name="PhysicalContact" summary="Supports sensing using a physical contact">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="4" code="AIR" name="ActiveInfrared" summary="Supports sensing using Active InfraRed measurement (e.g. time-of-flight or transflective/reflective IR sensing)">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="5" code="RAD" name="Radar" summary="Supports sensing using radar waves (microwave)">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="6" code="RFS" name="RFSensing" summary="Supports sensing using analysis of radio signals, e.g.: RSSI, CSI and/or any other metric from the signal">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="7" code="VIS" name="Vision" summary="Supports sensing based on analyzing images">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="9" code="OCCEVENT" name="OccupancyEvent" summary="Supports generating OccupancyChanged events">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="7"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="OccupancySensorTypeEnum">
+      <item value="0" name="PIR" summary="Indicates a passive infrared sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Ultrasonic" summary="Indicates a ultrasonic sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PIRAndUltrasonic" summary="Indicates a passive infrared and ultrasonic sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PhysicalContact" summary="Indicates a physical contact sensor.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OccupancyBitmap">
+      <bitfield name="Occupied" bit="0" summary="Indicates the sensed occupancy state">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OccupancySensorTypeBitmap">
+      <bitfield name="PIR" bit="0" summary="Indicates a passive infrared sensor.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Ultrasonic" bit="1" summary="Indicates a ultrasonic sensor.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PhysicalContact" bit="2" summary="Indicates a physical contact sensor.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="HoldTimeLimitsStruct">
+      <field id="0" name="HoldTimeMin" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="HoldTimeMax" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <maxOf>
+              <field name="HoldTimeMin"/>
+              <value>10</value>
+            </maxOf>
+          </min>
+        </constraint>
+      </field>
+      <field id="2" name="HoldTimeDefault" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from>
+              <field name="HoldTimeMin"/>
+            </from>
+            <to>
+              <field name="HoldTimeMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Occupancy" type="OccupancyBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="1"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="OccupancySensorType" type="OccupancySensorTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="OccupancySensorTypeBitmap" type="OccupancySensorTypeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="7"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="HoldTime" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="HoldTimeLimits">
+              <field name="HoldTimeMin"/>
+            </attribute>
+          </from>
+          <to>
+            <attribute name="HoldTimeLimits">
+              <field name="HoldTimeMax"/>
+            </attribute>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="HoldTimeLimits" type="HoldTimeLimitsStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <attribute name="HoldTime"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0010" name="PIROccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <orTerm>
+              <feature name="PIR"/>
+              <andTerm>
+                <notTerm>
+                  <feature name="PIR"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="US"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="PHY"/>
+                </notTerm>
+              </andTerm>
+            </orTerm>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0011" name="PIRUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <andTerm>
+              <attribute name="HoldTime"/>
+              <orTerm>
+                <feature name="PIR"/>
+                <andTerm>
+                  <notTerm>
+                    <feature name="PIR"/>
+                  </notTerm>
+                  <notTerm>
+                    <feature name="US"/>
+                  </notTerm>
+                  <notTerm>
+                    <feature name="PHY"/>
+                  </notTerm>
+                </andTerm>
+              </orTerm>
+            </andTerm>
+            <attribute name="PIRUnoccupiedToOccupiedThreshold"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <orTerm>
+              <feature name="PIR"/>
+              <andTerm>
+                <notTerm>
+                  <feature name="PIR"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="US"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="PHY"/>
+                </notTerm>
+              </andTerm>
+            </orTerm>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0012" name="PIRUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <andTerm>
+              <attribute name="HoldTime"/>
+              <orTerm>
+                <feature name="PIR"/>
+                <andTerm>
+                  <notTerm>
+                    <feature name="PIR"/>
+                  </notTerm>
+                  <notTerm>
+                    <feature name="US"/>
+                  </notTerm>
+                  <notTerm>
+                    <feature name="PHY"/>
+                  </notTerm>
+                </andTerm>
+              </orTerm>
+            </andTerm>
+            <attribute name="PIRUnoccupiedToOccupiedDelay"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <orTerm>
+              <feature name="PIR"/>
+              <andTerm>
+                <notTerm>
+                  <feature name="PIR"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="US"/>
+                </notTerm>
+                <notTerm>
+                  <feature name="PHY"/>
+                </notTerm>
+              </andTerm>
+            </orTerm>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0020" name="UltrasonicOccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="US"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0021" name="UltrasonicUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="US"/>
+            <attribute name="UltrasonicUnoccupiedToOccupiedThreshold"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="US"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0022" name="UltrasonicUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="US"/>
+            <attribute name="UltrasonicUnoccupiedToOccupiedDelay"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="US"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0030" name="PhysicalContactOccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="PHY"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0031" name="PhysicalContactUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="PHY"/>
+            <attribute name="PhysicalContactUnoccupiedToOccupiedThreshold"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="PHY"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0032" name="PhysicalContactUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="PHY"/>
+            <attribute name="PhysicalContactUnoccupiedToOccupiedDelay"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <attribute name="HoldTime"/>
+            <feature name="PHY"/>
+          </andTerm>
+        </optionalConform>
+        <deprecateConform/>
+      </otherwiseConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="OccupancyChanged" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="OCCEVENT"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="Occupancy" type="OccupancyBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/OnOff.xml b/data_model/1.6/clusters/OnOff.xml
new file mode 100644
index 00000000000..3927fe6a7b2
--- /dev/null
+++ b/data_model/1.6/clusters/OnOff.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0006" name="On/Off Cluster" revision="7">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1555"/>
+    <revision revision="2" summary="ZLO 1.0: StartUpOnOff"/>
+    <revision revision="3" summary="FeatureMap global attribute support with Level Control and Lighting feature"/>
+    <revision revision="4" summary="New data model format and notation"/>
+    <revision revision="5" summary="Addition of Dead Front behavior and associated FeatureMap entry"/>
+    <revision revision="6" summary="Addition of OffOnly feature and associated FeatureMap entry"/>
+    <revision revision="7" summary="Added Q quality to OnTime and OffWaitTime attributes"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0006" name="On/Off"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="OO" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LT" name="Lighting" summary="Behavior that supports lighting applications.">
+      <optionalConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="1" code="DF" name="DeadFrontBehavior" summary="Device has Dead Front behavior">
+      <optionalConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="2" code="OFFONLY" name="OffOnly" summary="Device supports the OffOnly Feature feature">
+      <optionalConform>
+        <notTerm>
+          <orTerm>
+            <feature name="LT"/>
+            <feature name="DF"/>
+          </orTerm>
+        </notTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="DelayedAllOffEffectVariantEnum">
+      <item value="0x00" name="DelayedOffFastFade" summary="Fade to off in 0.8 seconds">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="NoFade" summary="No fade">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="DelayedOffSlowFade" summary="50% dim down in 0.8 seconds then fade to off in 12 seconds">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DyingLightEffectVariantEnum">
+      <item value="0x00" name="DyingLightFadeOff" summary="20% dim up in 0.5s then fade to off in 1 second">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EffectIdentifierEnum">
+      <item value="0x00" name="DelayedAllOff" summary="Delayed All Off">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="DyingLight" summary="Dying Light">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StartUpOnOffEnum">
+      <item value="0" name="Off" summary="Set the OnOff attribute to FALSE">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="On" summary="Set the OnOff attribute to TRUE">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Toggle" summary="If the previous value of the OnOff attribute is equal to FALSE, set the OnOff attribute to TRUE. If the previous value of the OnOff attribute is equal to TRUE, set the OnOff attribute to FALSE (toggle).">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OnOffControlBitmap">
+      <bitfield name="AcceptOnlyWhenOn" bit="0" summary="Indicates a command is only accepted when in On state.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OnOff" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality scene="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x4000" name="GlobalSceneControl" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4001" name="OnTime" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4002" name="OffWaitTime" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality quieterReporting="true"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4003" name="StartUpOnOff" type="StartUpOnOffEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Off" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="On" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="Toggle" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x40" name="OffWithEffect" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <field id="0" name="EffectIdentifier" type="EffectIdentifierEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="EffectVariant" type="enum8">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x41" name="OnWithRecallGlobalScene" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x42" name="OnWithTimedOff" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <field id="0" name="OnOffControl" type="OnOffControlBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="1"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="OnTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="0xFFFE"/>
+        </constraint>
+      </field>
+      <field id="2" name="OffWaitTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="0xFFFE"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/OperationalCredentialCluster.xml b/data_model/1.6/clusters/OperationalCredentialCluster.xml
new file mode 100644
index 00000000000..e2550060f71
--- /dev/null
+++ b/data_model/1.6/clusters/OperationalCredentialCluster.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003E" name="Operational Credentials Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Introduction of command, attributes and fields to support the Fabric Table Vendor ID Verification Procedure. The procedure increased flash storage cost by approximately 90 bytes per fabric."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x003E" name="Operational Credentials"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="OPCREDS" scope="Node"/>
+  <dataTypes>
+    <enum name="CertificateChainTypeEnum">
+      <item value="1" name="DACCertificate" summary="Request the DER-encoded DAC certificate">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PAICertificate" summary="Request the DER-encoded PAI certificate">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="NodeOperationalCertStatusEnum">
+      <item value="0" name="OK" summary="OK, no error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="InvalidPublicKey" summary="Public Key in the NOC does not match the public key in the NOCSR">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidNodeOpId" summary="The Node Operational ID in the NOC is not formatted correctly.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="InvalidNOC" summary="Any other validation error in NOC chain">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="MissingCsr" summary="No record of prior CSR for which this NOC could match">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="TableFull" summary="NOCs table full, cannot add another one">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="InvalidAdminSubject" summary="Invalid CaseAdminSubject field for an AddNOC command.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="ReservedForFutureUse" summary="Reserved for future use">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="ReservedForFutureUse" summary="Reserved for future use">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="FabricConflict" summary="Trying to AddNOC instead of UpdateNOC against an existing Fabric.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="LabelConflict" summary="Label already exists on another Fabric.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="InvalidFabricIndex" summary="FabricIndex argument is invalid.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="FabricDescriptorStruct">
+      <field id="1" name="RootPublicKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="65"/>
+        </constraint>
+      </field>
+      <field id="2" name="VendorID" type="vendor-id">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="3" name="FabricID" type="fabric-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Label" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="6" name="VIDVerificationStatement" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <allowed value="85"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="NOCStruct">
+      <field id="1" name="NOC" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <field id="2" name="ICAC" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <field id="3" name="VVSC" type="octstr">
+        <describedConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NOCs" type="list">
+      <entry type="NOCStruct"/>
+      <access read="true" readPrivilege="admin" fabricScoped="true"/>
+      <quality changeOmitted="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="SupportedFabrics"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="Fabrics" type="list">
+      <entry type="FabricDescriptorStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="SupportedFabrics"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="SupportedFabrics" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="5"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="CommissionedFabrics" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <max>
+          <attribute name="SupportedFabrics"/>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="TrustedRootCertificates" type="list">
+      <entry type="octstr">
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="SupportedFabrics"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="CurrentFabricIndex" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AttestationRequest" direction="commandToServer" response="AttestationResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="AttestationNonce" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="AttestationResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="AttestationElements" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength>
+            <constant name="RESP_MAX" value="900"/>
+          </maxLength>
+        </constraint>
+      </field>
+      <field id="1" name="AttestationSignature" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="CertificateChainRequest" direction="commandToServer" response="CertificateChainResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="CertificateType" type="CertificateChainTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="CertificateChainResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Certificate" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="600"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="CSRRequest" direction="commandToServer" response="CSRResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="CSRNonce" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="IsForUpdateNOC" type="bool" default="false">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="CSRResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="NOCSRElements" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength>
+            <constant name="RESP_MAX" value="900"/>
+          </maxLength>
+        </constraint>
+      </field>
+      <field id="1" name="AttestationSignature" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="AddNOC" direction="commandToServer" response="NOCResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="NOCValue" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <field id="1" name="ICACValue" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <field id="2" name="IPKValue" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="CaseAdminSubject" type="subject-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="AdminVendorId" type="vendor-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="UpdateNOC" direction="commandToServer" response="NOCResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="NOCValue" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+      <field id="1" name="ICACValue" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="NOCResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="StatusCode" type="NodeOperationalCertStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FabricIndex" type="fabric-idx">
+        <otherwiseConform>
+          <mandatoryConform>
+            <equalTerm>
+              <field name="StatusCode"/>
+              <status name="SUCCESS"/>
+            </equalTerm>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="DebugText" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x09" name="UpdateFabricLabel" direction="commandToServer" response="NOCResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Label" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="RemoveFabric" direction="commandToServer" response="NOCResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0B" name="AddTrustedRootCertificate" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="RootCACertificate" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="SetVIDVerificationStatement" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="VendorID" type="vendor-id">
+        <optionalConform choice="a" more="true" min="1"/>
+      </field>
+      <field id="1" name="VIDVerificationStatement" type="octstr">
+        <optionalConform choice="a" more="true" min="1"/>
+        <constraint>
+          <maxLength value="85"/>
+        </constraint>
+      </field>
+      <field id="2" name="VVSC" type="octstr">
+        <optionalConform choice="a" more="true" min="1"/>
+        <constraint>
+          <maxLength value="400"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0D" name="SignVIDVerificationRequest" direction="commandToServer" response="SignVIDVerificationResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ClientChallenge" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0E" name="SignVIDVerificationResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="254"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="FabricBindingVersion" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="255"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="Signature" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <minLength value="1"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/OperationalState.xml b/data_model/1.6/clusters/OperationalState.xml
new file mode 100644
index 00000000000..d4520a072e6
--- /dev/null
+++ b/data_model/1.6/clusters/OperationalState.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0060" name="Operational State Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="The Pause and Resume commands are usable in all compatible states. Define reserved ranges for base/derived clusters."/>
+    <revision revision="3" summary="Changed CountdownTime attribute to Q quality."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0060" name="Operational State"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="OPSTATE" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="ErrorStateEnum">
+      <item value="0x00" name="NoError" summary="The device is not in an error state">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="UnableToStartOrResume" summary="The device is unable to start or resume operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="UnableToCompleteOperation" summary="The device was unable to complete the current operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="CommandInvalidInState" summary="The device cannot process the command in its current state">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperationalStateEnum">
+      <item value="0x00" name="Stopped" summary="The device is stopped">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Running" summary="The device is operating">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Paused" summary="The device is paused during an operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="Error" summary="The device is in an error state">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ErrorStateStruct">
+      <field id="0" name="ErrorStateID" type="ErrorStateEnum" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ErrorStateLabel" type="string" default="empty">
+        <mandatoryConform>
+          <andTerm>
+            <greaterOrEqualTerm>
+              <field name="ErrorStateID"/>
+              <literal value="0x80"/>
+            </greaterOrEqualTerm>
+            <lessOrEqualTerm>
+              <field name="ErrorStateID"/>
+              <literal value="0xBF"/>
+            </lessOrEqualTerm>
+          </andTerm>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="2" name="ErrorStateDetails" type="string" default="empty">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="OperationalStateStruct">
+      <field id="0" name="OperationalStateID" type="OperationalStateEnum" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationalStateLabel" type="string">
+        <mandatoryConform>
+          <andTerm>
+            <greaterOrEqualTerm>
+              <field name="OperationalStateID"/>
+              <literal value="0x80"/>
+            </greaterOrEqualTerm>
+            <lessOrEqualTerm>
+              <field name="OperationalStateID"/>
+              <literal value="0xBF"/>
+            </lessOrEqualTerm>
+          </andTerm>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PhaseList" type="list" default="MS">
+      <entry type="string">
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="32"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentPhase" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="CountdownTime" type="elapsed-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform/>
+      <constraint>
+        <max value="259200"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="OperationalStateList" type="list" default="MS">
+      <entry type="OperationalStateStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="OperationalState" type="OperationalStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="OperationalError" type="ErrorStateStruct">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Pause" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <command name="Resume"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x01" name="Stop" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <command name="Start"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x02" name="Start" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x03" name="Resume" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <command name="Pause"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x04" name="OperationalCommandResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <orTerm>
+          <command name="Pause"/>
+          <command name="Stop"/>
+          <command name="Start"/>
+          <command name="Resume"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="CommandResponseState" type="ErrorStateStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="OperationalError" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ErrorState" type="ErrorStateStruct">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="OperationCompletion" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="CompletionErrorCode" type="enum8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="TotalOperationalTime" type="elapsed-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="PausedTime" type="elapsed-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/OperationalState_Oven.xml b/data_model/1.6/clusters/OperationalState_Oven.xml
new file mode 100644
index 00000000000..c49426d6026
--- /dev/null
+++ b/data_model/1.6/clusters/OperationalState_Oven.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0048" name="Oven Cavity Operational State Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Set Pause and Resume commands as disallowed (previously a Device Type override)"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0048" name="Oven Cavity Operational State"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="OVENOPSTATE" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="Pause">
+      <disallowConform/>
+    </command>
+    <command id="0x01" name="Stop"/>
+    <command id="0x02" name="Start"/>
+    <command id="0x03" name="Resume">
+      <disallowConform/>
+    </command>
+    <command id="0x04" name="OperationalCommandResponse"/>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/OperationalState_RVC.xml b/data_model/1.6/clusters/OperationalState_RVC.xml
new file mode 100644
index 00000000000..a4e1110d28a
--- /dev/null
+++ b/data_model/1.6/clusters/OperationalState_RVC.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0061" name="RVC Operational State Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="The Pause and Resume commands are usable in all compatible states. Deprecate the Start and Stop commands. Add the GoHome command."/>
+    <revision revision="3" summary="Add several operational states and errors"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0061" name="RVC Operational State"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="RVCOPSTATE" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="ErrorStateEnum">
+      <item value="0x00" name="NoError" summary="The device is not in an error state">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="UnableToStartOrResume" summary="The device is unable to start or resume operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="UnableToCompleteOperation" summary="The device was unable to complete the current operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="CommandInvalidInState" summary="The device cannot process the command in its current state">
+        <mandatoryConform/>
+      </item>
+      <item value="0x40" name="FailedToFindChargingDock" summary="The device has failed to find or reach the charging dock">
+        <mandatoryConform/>
+      </item>
+      <item value="0x41" name="Stuck" summary="The device is stuck and requires manual intervention">
+        <mandatoryConform/>
+      </item>
+      <item value="0x42" name="DustBinMissing" summary="The device has detected that its dust bin is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x43" name="DustBinFull" summary="The device has detected that its dust bin is full">
+        <mandatoryConform/>
+      </item>
+      <item value="0x44" name="WaterTankEmpty" summary="The device has detected that its clean water tank is empty">
+        <mandatoryConform/>
+      </item>
+      <item value="0x45" name="WaterTankMissing" summary="The device has detected that its clean water tank is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x46" name="WaterTankLidOpen" summary="The device has detected that its water tank lid is open">
+        <mandatoryConform/>
+      </item>
+      <item value="0x47" name="MopCleaningPadMissing" summary="The device has detected that its cleaning pad is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x48" name="LowBattery" summary="The device is unable to start or to continue operating due to a low battery">
+        <mandatoryConform/>
+      </item>
+      <item value="0x49" name="CannotReachTargetArea" summary="The device is unable to move to an area where it was asked to operate, such as by setting the ServiceArea cluster&apos;s SelectedAreas attribute, due to an obstruction. For example, the obstruction might be a closed door or objects blocking the mapped path.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4A" name="DirtyWaterTankFull" summary="The device has detected that its dirty water tank is full">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4B" name="DirtyWaterTankMissing" summary="The device has detected that its dirty water tank is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4C" name="WheelsJammed" summary="The device has detected that one or more wheels are jammed by an object">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4D" name="BrushJammed" summary="The device has detected that its brush is jammed by an object">
+        <mandatoryConform/>
+      </item>
+      <item value="0x4E" name="NavigationSensorObscured" summary="The device has detected that one of its sensors, such as LiDAR, infrared, or camera is obscured and needs to be cleaned">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperationalStateEnum">
+      <item value="0x00" name="Stopped" summary="The device is stopped">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Running" summary="The device is operating">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Paused" summary="The device is paused during an operation">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="Error" summary="The device is in an error state">
+        <mandatoryConform/>
+      </item>
+      <item value="0x40" name="SeekingCharger" summary="The device is en route to the charging dock">
+        <mandatoryConform/>
+      </item>
+      <item value="0x41" name="Charging" summary="The device is charging">
+        <mandatoryConform/>
+      </item>
+      <item value="0x42" name="Docked" summary="The device is on the dock, not charging">
+        <mandatoryConform/>
+      </item>
+      <item value="0x43" name="EmptyingDustBin" summary="The device is automatically emptying its own dust bin, such as to a dock">
+        <optionalConform/>
+      </item>
+      <item value="0x44" name="CleaningMop" summary="The device is automatically cleaning its own mopping device, such as on a dock">
+        <optionalConform/>
+      </item>
+      <item value="0x45" name="FillingWaterTank" summary="The device is automatically filling its own clean water tank for use when mopping, such as from a dock">
+        <optionalConform/>
+      </item>
+      <item value="0x46" name="UpdatingMaps" summary="The device is processing acquired data to update its maps">
+        <optionalConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="Pause"/>
+    <command id="0x01" name="Stop">
+      <disallowConform/>
+    </command>
+    <command id="0x02" name="Start">
+      <disallowConform/>
+    </command>
+    <command id="0x03" name="Resume"/>
+    <command id="0x04" name="OperationalCommandResponse"/>
+    <command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/PowerSourceCluster.xml b/data_model/1.6/clusters/PowerSourceCluster.xml
new file mode 100644
index 00000000000..a90b69a7756
--- /dev/null
+++ b/data_model/1.6/clusters/PowerSourceCluster.xml
@@ -0,0 +1,872 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002F" name="Power Source Cluster" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added EndpointList attribute that maps a power source to a list of endpoints"/>
+    <revision revision="3" summary="Added Q quality (replacing C quality) on BatPercentRemaining, BatTimeRemaining and BatTimeToFullCharge"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002F" name="Power Source"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="PS" scope="Node"/>
+  <features>
+    <feature bit="0" code="WIRED" name="Wired" summary="A wired power source">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="BAT" name="Battery" summary="A battery power source">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="RECHG" name="Rechargeable" summary="A rechargeable battery power source">
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="REPLC" name="Replaceable" summary="A replaceable battery power source">
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="BatApprovedChemistryEnum">
+      <item value="0" name="Unspecified" summary="Cell chemistry is unspecified or unknown">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Alkaline" summary="Cell chemistry is alkaline">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="LithiumCarbonFluoride" summary="Cell chemistry is lithium carbon fluoride">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="LithiumChromiumOxide" summary="Cell chemistry is lithium chromium oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="LithiumCopperOxide" summary="Cell chemistry is lithium copper oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="LithiumIronDisulfide" summary="Cell chemistry is lithium iron disulfide">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="LithiumManganeseDioxide" summary="Cell chemistry is lithium manganese dioxide">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LithiumThionylChloride" summary="Cell chemistry is lithium thionyl chloride">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Magnesium" summary="Cell chemistry is magnesium">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="MercuryOxide" summary="Cell chemistry is mercury oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="NickelOxyhydride" summary="Cell chemistry is nickel oxyhydride">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="SilverOxide" summary="Cell chemistry is silver oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="ZincAir" summary="Cell chemistry is zinc air">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="ZincCarbon" summary="Cell chemistry is zinc carbon">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="ZincChloride" summary="Cell chemistry is zinc chloride">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="ZincManganeseDioxide" summary="Cell chemistry is zinc manganese dioxide">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="LeadAcid" summary="Cell chemistry is lead acid">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="LithiumCobaltOxide" summary="Cell chemistry is lithium cobalt oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="LithiumIon" summary="Cell chemistry is lithium ion">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="LithiumIonPolymer" summary="Cell chemistry is lithium ion polymer">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="LithiumIronPhosphate" summary="Cell chemistry is lithium iron phosphate">
+        <mandatoryConform/>
+      </item>
+      <item value="21" name="LithiumSulfur" summary="Cell chemistry is lithium sulfur">
+        <mandatoryConform/>
+      </item>
+      <item value="22" name="LithiumTitanate" summary="Cell chemistry is lithium titanate">
+        <mandatoryConform/>
+      </item>
+      <item value="23" name="NickelCadmium" summary="Cell chemistry is nickel cadmium">
+        <mandatoryConform/>
+      </item>
+      <item value="24" name="NickelHydrogen" summary="Cell chemistry is nickel hydrogen">
+        <mandatoryConform/>
+      </item>
+      <item value="25" name="NickelIron" summary="Cell chemistry is nickel iron">
+        <mandatoryConform/>
+      </item>
+      <item value="26" name="NickelMetalHydride" summary="Cell chemistry is nickel metal hydride">
+        <mandatoryConform/>
+      </item>
+      <item value="27" name="NickelZinc" summary="Cell chemistry is nickel zinc">
+        <mandatoryConform/>
+      </item>
+      <item value="28" name="SilverZinc" summary="Cell chemistry is silver zinc">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="SodiumIon" summary="Cell chemistry is sodium ion">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="SodiumSulfur" summary="Cell chemistry is sodium sulfur">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="ZincBromide" summary="Cell chemistry is zinc bromide">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="ZincCerium" summary="Cell chemistry is zinc cerium">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AmbientTooHot" summary="The Node detects the ambient temperature is above the nominal range for this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AmbientTooCold" summary="The Node detects the ambient temperature is below the nominal range for this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="BatteryTooHot" summary="The Node detects the temperature of this battery source is above the nominal range.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="BatteryTooCold" summary="The Node detects the temperature of this battery source is below the nominal range.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="BatteryAbsent" summary="The Node detects this battery source is not present.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="BatteryOverVoltage" summary="The Node detects this battery source is over voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="BatteryUnderVoltage" summary="The Node detects this battery source is under voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="ChargerOverVoltage" summary="The Node detects the charger for this battery source is over voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="ChargerUnderVoltage" summary="The Node detects the charger for this battery source is under voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="SafetyTimeout" summary="The Node detects a charging safety timeout for this battery source.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeLevelEnum">
+      <item value="0" name="OK" summary="Charge level is nominal">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Charge level is low, intervention may soon be required.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Critical" summary="Charge level is critical, immediate intervention is required">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeStateEnum">
+      <item value="0" name="Unknown" summary="Unable to determine the charging state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="IsCharging" summary="The battery is charging">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="IsAtFullCharge" summary="The battery is at full charge">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="IsNotCharging" summary="The battery is not charging">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatCommonDesignationEnum">
+      <item value="0" name="Unspecified" summary="Common type is unknown or unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AAA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="C" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="D" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="4v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="6v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="9v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="1_2AA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="AAAA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="B" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="F" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="N" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="No6" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="SubC" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="A23" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="A27" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="BA5800" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="Duplex" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="4SR44" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="21" name="523" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="22" name="531" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="23" name="15v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="24" name="22v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="25" name="30v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="26" name="45v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="27" name="67v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="28" name="J" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="CR123A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="CR2" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="2CR5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="CR_P2" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="33" name="CR_V3" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="34" name="SR41" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="35" name="SR43" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="36" name="SR44" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="37" name="SR45" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="38" name="SR48" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="39" name="SR54" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="40" name="SR55" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="41" name="SR57" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="42" name="SR58" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="43" name="SR59" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="44" name="SR60" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="45" name="SR63" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="46" name="SR64" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="47" name="SR65" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="48" name="SR66" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="49" name="SR67" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="50" name="SR68" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="51" name="SR69" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="52" name="SR516" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="53" name="SR731" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="54" name="SR712" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="55" name="LR932" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="56" name="A5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="57" name="A10" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="58" name="A13" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="59" name="A312" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="60" name="A675" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="61" name="AC41E" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="62" name="10180" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="63" name="10280" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="64" name="10440" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="14250" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="14430" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="14500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="68" name="14650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="69" name="15270" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="70" name="16340" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="71" name="RCR123A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="72" name="17500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="73" name="17670" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="74" name="18350" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="75" name="18500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="76" name="18650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="77" name="19670" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="78" name="25500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="79" name="26650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="80" name="32600" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this battery power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OverTemp" summary="The Node detects the temperature of this battery power source is above ideal operating conditions.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UnderTemp" summary="The Node detects the temperature of this battery power source is below ideal operating conditions.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatReplaceabilityEnum">
+      <item value="0" name="Unspecified" summary="The replaceability is unspecified or unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotReplaceable" summary="The battery is not replaceable.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UserReplaceable" summary="The battery is replaceable by the user or customer.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="FactoryReplaceable" summary="The battery is replaceable by an authorized factory technician.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PowerSourceStatusEnum">
+      <item value="0" name="Unspecified" summary="Indicate the source status is not specified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Active" summary="Indicate the source is available and currently supplying power">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Standby" summary="Indicate the source is available, but is not currently supplying power">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Unavailable" summary="Indicate the source is not currently available to supply power">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiredCurrentTypeEnum">
+      <item value="0" name="AC" summary="Indicates AC current">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DC" summary="Indicates DC current">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiredFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this wired power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OverVoltage" summary="The Node detects the supplied voltage is above maximum supported value for this wired power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UnderVoltage" summary="The Node detects the supplied voltage is below maximum supported value for this wired power source.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Status" type="PowerSourceStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="Order" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="Description" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="60"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="WiredAssessedInputVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0004" name="WiredAssessedInputFrequency" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0005" name="WiredCurrentType" type="WiredCurrentTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="WIRED"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="WiredAssessedCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0007" name="WiredNominalVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0008" name="WiredMaximumCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0009" name="WiredPresent" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000A" name="ActiveWiredFaults" type="list">
+      <entry type="WiredFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+      <constraint>
+        <maxCount value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="BatVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000C" name="BatPercentRemaining" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <constraint>
+        <max value="200"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000D" name="BatTimeRemaining" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000E" name="BatChargeLevel" type="BatChargeLevelEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="BatReplacementNeeded" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0010" name="BatReplaceability" type="BatReplaceabilityEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0011" name="BatPresent" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0012" name="ActiveBatFaults" type="list">
+      <entry type="BatFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <constraint>
+        <maxCount value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="BatReplacementDescription" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="REPLC"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="60"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0014" name="BatCommonDesignation" type="BatCommonDesignationEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0015" name="BatANSIDesignation" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint>
+        <maxLength value="20"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="BatIECDesignation" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint>
+        <maxLength value="20"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0017" name="BatApprovedChemistry" type="BatApprovedChemistryEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0018" name="BatCapacity" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <orTerm>
+          <feature name="REPLC"/>
+          <feature name="RECHG"/>
+        </orTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0019" name="BatQuantity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="REPLC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001A" name="BatChargeState" type="BatChargeStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RECHG"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001B" name="BatTimeToFullCharge" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001C" name="BatFunctionalWhileCharging" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RECHG"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001D" name="BatChargingCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001E" name="ActiveBatChargeFaults" type="list">
+      <entry type="BatChargeFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <constraint>
+        <maxCount value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001F" name="EndpointList" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="WiredFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+      <field id="0" name="Current" type="list" default="empty">
+        <entry type="WiredFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list" default="empty">
+        <entry type="WiredFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x01" name="BatFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <field id="0" name="Current" type="list" default="empty">
+        <entry type="BatFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list" default="empty">
+        <entry type="BatFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="8"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x02" name="BatChargeFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <field id="0" name="Current" type="list" default="empty">
+        <entry type="BatChargeFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="Previous" type="list" default="empty">
+        <entry type="BatChargeFaultEnum"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxCount value="16"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/PowerSourceConfigurationCluster.xml b/data_model/1.6/clusters/PowerSourceConfigurationCluster.xml
new file mode 100644
index 00000000000..6fdce527526
--- /dev/null
+++ b/data_model/1.6/clusters/PowerSourceConfigurationCluster.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002E" name="Power Source Configuration Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x002E" name="Power Source Configuration"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="PSCFG" scope="Node"/>
+  <attributes>
+    <attribute id="0x0000" name="Sources" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="6"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/PowerTopology.xml b/data_model/1.6/clusters/PowerTopology.xml
new file mode 100644
index 00000000000..09c20f78208
--- /dev/null
+++ b/data_model/1.6/clusters/PowerTopology.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009C" name="Power Topology Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x009C" name="Power Topology"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="PWRTL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NODE" name="NodeTopology" summary="This endpoint provides or consumes power to/from the entire node">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TREE" name="TreeTopology" summary="This endpoint provides or consumes power to/from itself and its child endpoints">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="SET" name="SetTopology" summary="This endpoint provides or consumes power to/from a specified set of endpoints">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="3" code="DYPF" name="DynamicPowerFlow" summary="The specified set of endpoints may change">
+      <optionalConform>
+        <feature name="SET"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="CircuitNodeStruct">
+      <field id="1" name="Node" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoint" type="endpoint-no">
+        <optionalConform/>
+      </field>
+      <field id="3" name="Label" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AvailableEndpoints" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="SET"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="20"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ActiveEndpoints" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="DYPF"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="20"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/PressureMeasurement.xml b/data_model/1.6/clusters/PressureMeasurement.xml
new file mode 100644
index 00000000000..31296b89da1
--- /dev/null
+++ b/data_model/1.6/clusters/PressureMeasurement.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0403" name="Pressure Measurement Cluster" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0403" name="Pressure Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="PRS" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="EXT" name="Extended" summary="Extended range and resolution">
+      <optionalConform/>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="32766"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <attribute name="MinMeasuredValue"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </from>
+          <to value="32767"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="ScaledValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinScaledValue"/>
+          </from>
+          <to>
+            <attribute name="MaxScaledValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0011" name="MinScaledValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="32766"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="MaxScaledValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <attribute name="MinScaledValue"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </from>
+          <to value="32767"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="ScaledTolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="EXT"/>
+      </optionalConform>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0014" name="Scale" type="int8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="-127"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/PumpConfigurationControl.xml b/data_model/1.6/clusters/PumpConfigurationControl.xml
new file mode 100644
index 00000000000..ceda5550b5a
--- /dev/null
+++ b/data_model/1.6/clusters/PumpConfigurationControl.xml
@@ -0,0 +1,458 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0200" name="Pump Configuration and Control Cluster" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="All Hubs changes"/>
+    <revision revision="3" summary="New data model format and notation, added additional events"/>
+    <revision revision="4" summary="Added feature map"/>
+    <revision revision="5" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0200" name="Pump Configuration and Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="PCC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PRSCONST" name="ConstantPressure" summary="Supports operating in constant pressure mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="PRSCOMP" name="CompensatedPressure" summary="Supports operating in compensated pressure mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="FLW" name="ConstantFlow" summary="Supports operating in constant flow mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="3" code="SPD" name="ConstantSpeed" summary="Supports operating in constant speed mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="4" code="TEMP" name="ConstantTemperature" summary="Supports operating in constant temperature mode">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="5" code="AUTO" name="Automatic" summary="Supports operating in automatic mode">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="LOCAL" name="LocalOperation" summary="Supports operating using local settings">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ControlModeEnum">
+      <item value="0" name="ConstantSpeed" summary="The pump is running at a constant speed.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="ConstantPressure" summary="The pump will regulate its speed to maintain a constant differential pressure over its flanges.">
+        <mandatoryConform>
+          <feature name="PRSCONST"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="ProportionalPressure" summary="The pump will regulate its speed to maintain a constant differential pressure over its flanges.">
+        <mandatoryConform>
+          <feature name="PRSCOMP"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="ConstantFlow" summary="The pump will regulate its speed to maintain a constant flow through the pump.">
+        <mandatoryConform>
+          <feature name="FLW"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="ConstantTemperature" summary="The pump will regulate its speed to maintain a constant temperature.">
+        <mandatoryConform>
+          <feature name="TEMP"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="Automatic" summary="The operation of the pump is automatically optimized to provide the most suitable performance with respect to comfort and energy savings.">
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="OperationModeEnum">
+      <item value="0" name="Normal" summary="The pump is controlled by a setpoint, as defined by a connected remote sensor or by the ControlMode attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Minimum" summary="This value sets the pump to run at the minimum possible speed it can without being stopped.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Maximum" summary="This value sets the pump to run at its maximum possible speed.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Local" summary="This value sets the pump to run with the local settings of the pump, regardless of what these are.">
+        <mandatoryConform>
+          <feature name="LOCAL"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="PumpStatusBitmap">
+      <bitfield name="DeviceFault" bit="0" summary="A fault related to the system or pump device is detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SupplyFault" bit="1" summary="A fault related to the supply to the pump is detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SpeedLow" bit="2" summary="Setpoint is too low to achieve.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SpeedHigh" bit="3" summary="Setpoint is too high to achieve.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LocalOverride" bit="4" summary="Device control is overridden by hardware, such as an external STOP button or via a local HMI.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Running" bit="5" summary="Pump is currently running">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemotePressure" bit="6" summary="A remote pressure sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemoteFlow" bit="7" summary="A remote flow sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemoteTemperature" bit="8" summary="A remote temperature sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxPressure" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="MaxSpeed" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="MaxFlow" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="MinConstPressure" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="PRSCONST"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0004" name="MaxConstPressure" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="PRSCONST"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0005" name="MinCompPressure" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="PRSCOMP"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0006" name="MaxCompPressure" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="PRSCOMP"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0007" name="MinConstSpeed" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0008" name="MaxConstSpeed" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0009" name="MinConstFlow" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="FLW"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000A" name="MaxConstFlow" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="FLW"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x000B" name="MinConstTemp" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="TEMP"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+      <constraint>
+        <min value="-27315"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="MaxConstTemp" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="TEMP"/>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+      <constraint>
+        <min value="-27315"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0010" name="PumpStatus" type="PumpStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0011" name="EffectiveOperationMode" type="OperationModeEnum" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="EffectiveControlMode" type="ControlModeEnum" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="Capacity" type="int16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0014" name="Speed" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0015" name="LifetimeRunningHours" type="uint24" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0016" name="Power" type="uint24" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0017" name="LifetimeEnergyConsumed" type="uint32" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0020" name="OperationMode" type="OperationModeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0021" name="ControlMode" type="ControlModeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0022" name="AlarmMask">
+      <deprecateConform/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="SupplyVoltageLow" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x01" name="SupplyVoltageHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="PowerMissingPhase" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x03" name="SystemPressureLow" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x04" name="SystemPressureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x05" name="DryRunning" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x06" name="MotorTemperatureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x07" name="PumpMotorFatalFailure" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x08" name="ElectronicTemperatureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x09" name="PumpBlocked" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0A" name="SensorFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0B" name="ElectronicNonFatalFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0C" name="ElectronicFatalFailure" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0D" name="GeneralFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0E" name="Leakage" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0F" name="AirDetection" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x10" name="TurbineOperation" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/PushAVStreamTransport.xml b/data_model/1.6/clusters/PushAVStreamTransport.xml
new file mode 100644
index 00000000000..55dc43271e9
--- /dev/null
+++ b/data_model/1.6/clusters/PushAVStreamTransport.xml
@@ -0,0 +1,710 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0555" name="Push AV Stream Transport Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Add DoorbellPressed to TriggerActivationReason. Augment PushTransport events with Session numbers and Event context. Add multi-stream support."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0555" name="Push AV Stream Transport"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="PAVST" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PERZONESENS" name="PerZoneSensitivity" summary="Supports a sensitivity value per Zone">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="METADATA" name="Metadata" summary="Supports metadata transmission in Push transports">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="PushTransportConnectionID" type="uint16"/>
+    <enum name="CMAFInterfaceEnum">
+      <item value="0" name="Interface1" summary="CMAF Interface-1 Mode">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Interface2DASH" summary="CMAF Interface-2 Mode with DASH Support">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="2" name="Interface2HLS" summary="CMAF Interface-2 Mode with HLS Support">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+    </enum>
+    <enum name="ContainerFormatEnum">
+      <item value="0" name="CMAF" summary="CMAF container format">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="IngestMethodsEnum">
+      <item value="0" name="CMAFIngest" summary="CMAF ingestion format">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="InvalidTLSEndpoint" summary="The specified TLSEndpointID cannot be found.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="InvalidStream" summary="The specified VideoStreamID or AudioStreamID cannot be found.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="InvalidURL" summary="The specified URL is invalid.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x05" name="InvalidZone" summary="A specified ZoneID was invalid.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x06" name="InvalidCombination" summary="The specified combination of Ingestion method and Container format is not supported.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x07" name="InvalidTriggerType" summary="The trigger type is invalid for this command.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x08" name="InvalidTransportStatus" summary="The Stream Transport Status is invalid for this command.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x09" name="InvalidOptions" summary="The requested Container options are not supported with the streams indicated.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0A" name="InvalidStreamUsage" summary="The requested StreamUsage is not allowed.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0B" name="InvalidTime" summary="Time sync has not occurred yet.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x0C" name="InvalidPreRollLength" summary="The requested pre roll length is not compatible with the streams key frame interval.">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </item>
+      <item value="0x0D" name="DuplicateStreamValues" summary="The requested Streams info contained duplicate entries.">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="TransportStatusEnum">
+      <item value="0" name="Active" summary="Push Transport can transport AV Streams">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Inactive" summary="Push Transport cannot transport AV Streams">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TransportTriggerTypeEnum">
+      <item value="0" name="Command" summary="Triggered only via a command invocation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Motion" summary="Triggered via motion detection or command">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Continuous" summary="Triggered always when transport status is Active">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TriggerActivationReasonEnum">
+      <item value="0" name="UserInitiated" summary="Trigger has been activated by user action">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Automation" summary="Trigger has been activated by automation">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Emergency" summary="Trigger has been activated for emergency reasons">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="DoorbellPressed" summary="Trigger has been activated by a doorbell press">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="AudioStreamStruct">
+      <field id="0" name="AudioStreamName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="AudioStreamID" type="AudioStreamID">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="CMAFContainerOptionsStruct">
+      <field id="0" name="CMAFInterface" type="CMAFInterfaceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SegmentDuration" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="500"/>
+            <to value="65500"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="ChunkDuration" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>divide</operation>
+                <left>
+                  <field name="SegmentDuration"/>
+                </left>
+                <right value="2"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="SessionGroup" type="uint8">
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="4" name="TrackName" type="string">
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="5" name="CENCKey" type="octstr">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="6" name="CENCKeyID" type="octstr">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <field name="CENCKey"/>
+          </mandatoryConform>
+        </otherwiseConform>
+        <constraint>
+          <allowed value="16"/>
+        </constraint>
+      </field>
+      <field id="7" name="MetadataEnabled" type="bool">
+        <optionalConform>
+          <feature name="METADATA"/>
+        </optionalConform>
+      </field>
+    </struct>
+    <struct name="ContainerOptionsStruct">
+      <field id="0" name="ContainerType" type="ContainerFormatEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CMAFContainerOptions" type="CMAFContainerOptionsStruct">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="ContainerType"/>
+            <enum name="ContainerFormatEnum" value="CMAF"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="SupportedFormatStruct">
+      <field id="0" name="ContainerFormat" type="ContainerFormatEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="IngestMethod" type="IngestMethodsEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TransportConfigurationStruct">
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="TransportStatus" type="TransportStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransportOptions" type="TransportOptionsStruct">
+        <optionalConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="TransportMotionTriggerTimeControlStruct">
+      <field id="0" name="InitialDuration" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="AugmentationDuration" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MaxDuration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <field name="InitialDuration"/>
+          </min>
+        </constraint>
+      </field>
+      <field id="3" name="BlindDuration" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TransportOptionsStruct">
+      <field id="0" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VideoStreamID" type="VideoStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="2" name="AudioStreamID" type="AudioStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="3" name="TLSEndpointID" type="TLSEndpointID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="URL" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="13"/>
+            <to value="2000"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="5" name="TriggerOptions" type="TransportTriggerOptionsStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="IngestMethod" type="IngestMethodsEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="ContainerOptions" type="ContainerOptionsStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="ExpiryTime" type="epoch-s">
+        <optionalConform/>
+      </field>
+      <field id="9" name="VideoStreams" type="list">
+        <entry type="VideoStreamStruct"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <optionalConform choice="a" more="true" min="1">
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="10" name="AudioStreams" type="list">
+        <entry type="AudioStreamStruct"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <optionalConform choice="a" more="true" min="1">
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TransportTriggerOptionsStruct">
+      <field id="0" name="TriggerType" type="TransportTriggerTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MotionZones" type="list">
+        <entry type="TransportZoneOptionsStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <equalTerm>
+            <field name="TriggerType"/>
+            <enum name="TransportTriggerTypeEnum" value="Motion"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="MotionSensitivity" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <andTerm>
+            <equalTerm>
+              <field name="TriggerType"/>
+              <enum name="TransportTriggerTypeEnum" value="Motion"/>
+            </equalTerm>
+            <notTerm>
+              <feature name="PERZONESENS"/>
+            </notTerm>
+          </andTerm>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="MotionTimeControl" type="TransportMotionTriggerTimeControlStruct">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="TriggerType"/>
+            <enum name="TransportTriggerTypeEnum" value="Motion"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="MaxPreRollLen" type="uint16">
+        <mandatoryConform>
+          <orTerm>
+            <equalTerm>
+              <field name="TriggerType"/>
+              <enum name="TransportTriggerTypeEnum" value="Command"/>
+            </equalTerm>
+            <equalTerm>
+              <field name="TriggerType"/>
+              <enum name="TransportTriggerTypeEnum" value="Motion"/>
+            </equalTerm>
+          </orTerm>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="TransportZoneOptionsStruct">
+      <field id="0" name="Zone" type="ZoneID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Sensitivity" type="uint8">
+        <mandatoryConform>
+          <feature name="PERZONESENS"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="10"/>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="VideoStreamStruct">
+      <field id="0" name="VideoStreamName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="VideoStreamID" type="VideoStreamID">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedFormats" type="list">
+      <entry type="SupportedFormatStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <minCount value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentConnections" type="list">
+      <entry type="TransportConfigurationStruct"/>
+      <access read="true" readPrivilege="view" fabricSensitive="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AllocatePushTransport" direction="commandToServer" response="AllocatePushTransportResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TransportOptions" type="TransportOptionsStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="AllocatePushTransportResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TransportConfiguration" type="TransportConfigurationStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="DeallocatePushTransport" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="ModifyPushTransport" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="TransportOptions" type="TransportOptionsStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="SetTransportStatus" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="TransportStatus" type="TransportStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="ManuallyTriggerTransport" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ActivationReason" type="TriggerActivationReasonEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TimeControl" type="TransportMotionTriggerTimeControlStruct">
+        <optionalConform/>
+      </field>
+      <field id="3" name="UserDefined" type="octstr">
+        <optionalConform>
+          <feature name="METADATA"/>
+        </optionalConform>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="FindTransport" direction="commandToServer" response="FindTransportResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="FindTransportResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TransportConfigurations" type="list">
+        <entry type="TransportConfigurationStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="PushTransportBegin" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="TriggerType" type="TransportTriggerTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ActivationReason" type="TriggerActivationReasonEnum">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="TriggerType"/>
+            <enum name="TransportTriggerTypeEnum" value="Command"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+      <field id="3" name="ContainerType" type="ContainerFormatEnum">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="CMAFSessionNumber" type="uint64">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="ContainerType"/>
+            <enum name="ContainerFormatEnum" value="CMAF"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x01" name="PushTransportEnd" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ConnectionID" type="PushTransportConnectionID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ContainerType" type="ContainerFormatEnum">
+        <mandatoryConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="CMAFSessionNumber" type="uint64">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="ContainerType"/>
+            <enum name="ContainerFormatEnum" value="CMAF"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/RefrigeratorAlarm.xml b/data_model/1.6/clusters/RefrigeratorAlarm.xml
new file mode 100644
index 00000000000..4504d587d4d
--- /dev/null
+++ b/data_model/1.6/clusters/RefrigeratorAlarm.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0057" name="Refrigerator Alarm Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0057" name="Refrigerator Alarm"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Alarm Base" role="application" picsCode="REFALM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="AlarmBitmap">
+      <bitfield name="DoorOpen" bit="0" summary="The cabinet&apos;s door has been open for a vendor defined amount of time.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <commands>
+    <command id="0x01" name="ModifyEnabledAlarms">
+      <disallowConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ResourceMonitoring.xml b/data_model/1.6/clusters/ResourceMonitoring.xml
new file mode 100644
index 00000000000..462ad35e71f
--- /dev/null
+++ b/data_model/1.6/clusters/ResourceMonitoring.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Resource Monitoring Clusters" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0071" name="HEPA Filter Monitoring" picsCode="HEPAFREMON"/>
+    <clusterId id="0x0072" name="Activated Carbon Filter Monitoring" picsCode="ACFREMON"/>
+    <clusterId id="0x0079" name="Water Tank Level Monitoring" picsCode="WTLREPMON"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="REPM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CON" name="Condition" summary="Supports monitoring the condition of the resource in percentage">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="WRN" name="Warning" summary="Supports warning indication">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="REP" name="ReplacementProductList" summary="Supports specifying the list of replacement products">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ChangeIndicationEnum">
+      <item value="0" name="OK" summary="Resource is in good condition, no intervention required">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Resource will be exhausted soon, intervention will shortly be required">
+        <mandatoryConform>
+          <feature name="WRN"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Critical" summary="Resource is exhausted, immediate intervention is required">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DegradationDirectionEnum">
+      <item value="0" name="Up" summary="The degradation of the resource is indicated by an upwards moving/increasing value">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Down" summary="The degradation of the resource is indicated by a downwards moving/decreasing value">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ProductIdentifierTypeEnum">
+      <item value="0" name="UPC" summary="12-digit Universal Product Code">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GTIN-8" summary="8-digit Global Trade Item Number">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="EAN" summary="13-digit European Article Number">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="GTIN-14" summary="14-digit Global Trade Item Number">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="OEM" summary="Original Equipment Manufacturer part number">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ReplacementProductStruct">
+      <field id="0" name="ProductIdentifierType" type="ProductIdentifierTypeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="ProductIdentifierValue" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="20"/>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Condition" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CON"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="DegradationDirection" type="DegradationDirectionEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="CON"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ChangeIndication" type="ChangeIndicationEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="InPlaceIndicator" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="LastChangedTime" type="epoch-s" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="ReplacementProductList" type="list">
+      <entry type="ReplacementProductStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="REP"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="5"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCondition" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/Scenes.xml b/data_model/1.6/clusters/Scenes.xml
new file mode 100644
index 00000000000..4f2303181b7
--- /dev/null
+++ b/data_model/1.6/clusters/Scenes.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0062" name="Scenes Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Based on the ZCL Scenes Cluster, Updated the Cluster ID to 0x0062, the name to Scenes Management, removed the provisional status; Removed attributes SceneCount, CurrentScene, CurrentGroup, SceneValid, and NameSupport; Removed Explicit, TableSize and FabricScenes features; Removed EnhancedAddScene, EnhancedAddSceneResponse, EnhancedViewScene, EnhancedViewSceneResponse; TransitionTime field changed milliseconds in AddScene, ViewSceneResponse and RecallScene"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0062" name="Scenes Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="S" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SN" name="SceneNames" summary="The ability to store a name for a scene.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="CopyModeBitmap">
+      <bitfield name="CopyAllScenes" bit="0" summary="Copy all scenes in the scene table">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AttributeValuePairStruct">
+      <field id="0" name="AttributeID" type="attribute-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ValueUnsigned8" type="uint8">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="2" name="ValueSigned8" type="int8">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="3" name="ValueUnsigned16" type="uint16">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="4" name="ValueSigned16" type="int16">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="5" name="ValueUnsigned32" type="uint32">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="6" name="ValueSigned32" type="int32">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="7" name="ValueUnsigned64" type="uint64">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="8" name="ValueSigned64" type="int64">
+        <optionalConform choice="a"/>
+      </field>
+    </struct>
+    <struct name="ExtensionFieldSetStruct">
+      <field id="0" name="ClusterID" type="cluster-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="AttributeValueList" type="list">
+        <entry type="AttributeValuePairStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="SceneInfoStruct">
+      <field id="0" name="SceneCount" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CurrentScene" type="uint8">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="CurrentGroup" type="group-id">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SceneValid" type="bool">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="RemainingCapacity" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="253"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DoNotUse">
+      <access read="true" readPrivilege="view"/>
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0001" name="SceneTableSize" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="FabricSceneInfo" type="list">
+      <entry type="SceneInfoStruct"/>
+      <access read="true" readPrivilege="view" fabricScoped="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddScene" direction="commandToServer" response="AddSceneResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="2" name="TransitionTime" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <max value="60000000"/>
+        </constraint>
+      </field>
+      <field id="3" name="SceneName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="4" name="ExtensionFieldSetStructs" type="list">
+        <entry type="ExtensionFieldSetStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x00" name="AddSceneResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ViewScene" direction="commandToServer" response="ViewSceneResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="ViewSceneResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="3" name="TransitionTime" type="uint32">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <status name="SUCCESS"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <max value="60000000"/>
+        </constraint>
+      </field>
+      <field id="4" name="SceneName" type="string">
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <status name="SUCCESS"/>
+          </equalTerm>
+        </mandatoryConform>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="5" name="ExtensionFieldSetStructs" type="list">
+        <entry type="ExtensionFieldSetStruct"/>
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <status name="SUCCESS"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveScene" direction="commandToServer" response="RemoveSceneResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveSceneResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveAllScenes" direction="commandToServer" response="RemoveAllScenesResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveAllScenesResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StoreScene" direction="commandToServer" response="StoreSceneResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="StoreSceneResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="RecallScene" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="2" name="TransitionTime" type="uint32">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <max value="60000000"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="GetSceneMembership" direction="commandToServer" response="GetSceneMembershipResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="GetSceneMembershipResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Capacity" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SceneList" type="list">
+        <entry type="uint8"/>
+        <mandatoryConform>
+          <equalTerm>
+            <field name="Status"/>
+            <status name="SUCCESS"/>
+          </equalTerm>
+        </mandatoryConform>
+      </field>
+    </command>
+    <command id="0x40" name="CopyScene" direction="commandToServer" response="CopySceneResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <optionalConform/>
+      <field id="0" name="Mode" type="CopyModeBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupIdentifierFrom" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneIdentifierFrom" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="3" name="GroupIdentifierTo" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SceneIdentifierTo" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x40" name="CopySceneResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <command name="CopyScene"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="GroupIdentifierFrom" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneIdentifierFrom" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ServiceArea.xml b/data_model/1.6/clusters/ServiceArea.xml
new file mode 100644
index 00000000000..897c1f33e75
--- /dev/null
+++ b/data_model/1.6/clusters/ServiceArea.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0150" name="Service Area Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Rename InitialTimeEstimate to EstimatedTime"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0150" name="Service Area"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SEAR" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SELRUN" name="SelectWhileRunning" summary="The device allows changing the selected areas while running">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="PROG" name="ProgressReporting" summary="The device implements the progress reporting feature">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="MAPS" name="Maps" summary="The device has map support">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="OperationalStatusEnum">
+      <item value="0x00" name="Pending" summary="The device has not yet started operating at the given area, or has not finished operating at that area but it is not currently operating at the area">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="Operating" summary="The device is currently operating at the given area">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="Skipped" summary="The device has skipped the given area, before or during operating at it, due to a SkipArea command, due an out of band command (e.g. from the vendor&apos;s application), due to a vendor specific reason, such as a time limit used by the device, or due the device ending operating unsuccessfully">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="Completed" summary="The device has completed operating at the given area">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SelectAreasStatus">
+      <item value="0x00" name="Success" summary="Attempting to operate in the areas identified by the entries of the NewAreas field is allowed and possible. The SelectedAreas attribute is set to the value of the NewAreas field.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="UnsupportedArea" summary="The value of at least one of the entries of the NewAreas field doesn&apos;t match any entries in the SupportedAreas attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="InvalidInMode" summary="The received request cannot be handled due to the current mode of the device.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="InvalidSet" summary="The set of values is invalid. For example, areas on different floors, that a robot knows it can&apos;t reach on its own.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SkipAreaStatus">
+      <item value="0x00" name="Success" summary="Skipping the area is allowed and possible, or the device was operating at the last available area and has stopped.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x01" name="InvalidAreaList" summary="The SelectedAreas attribute is empty.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x02" name="InvalidInMode" summary="The received request cannot be handled due to the current mode of the device. For example, the CurrentArea attribute is null or the device is not operating.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="InvalidSkippedArea" summary="The SkippedArea field doesn&apos;t match an entry in the SupportedAreas list.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="AreaInfoStruct">
+      <field id="0" name="LocationInfo" type="LocationDescriptorStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="LandmarkInfo" type="LandmarkInfoStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="AreaStruct">
+      <field id="0" name="AreaID" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MapID" type="uint32" default="MS">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="AreaInfo" type="AreaInfoStruct" default="MS">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="LandmarkInfoStruct">
+      <field id="0" name="LandmarkTag" type="tag">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RelativePositionTag" type="tag">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="MapStruct">
+      <field id="0" name="MapID" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string" default="MS">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ProgressStruct">
+      <field id="0" name="AreaID" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Status" type="OperationalStatusEnum" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TotalOperationalTime" type="elapsed-s" default="MS">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="3" name="EstimatedTime" type="elapsed-s" default="MS">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedAreas" type="list" default="MS">
+      <entry type="AreaStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="SupportedMaps" type="list" default="MS">
+      <entry type="MapStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MAPS"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="255"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="SelectedAreas" type="list" default="empty">
+      <entry type="uint32"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="CurrentArea" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <describedConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="EstimatedEndTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <optionalConform>
+        <attribute name="CurrentArea"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0005" name="Progress" type="list" default="empty">
+      <entry type="ProgressStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="PROG"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="255"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelectAreas" direction="commandToServer" response="SelectAreasResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NewAreas" type="list">
+        <entry type="uint32"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="SelectAreasResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="SelectAreasStatus">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StatusText" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="SkipArea" direction="commandToServer" response="SkipAreaResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <orTerm>
+          <attribute name="CurrentArea"/>
+          <attribute name="Progress"/>
+        </orTerm>
+      </optionalConform>
+      <field id="0" name="SkippedArea" type="uint32">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="SkipAreaResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <command name="SkipArea"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="SkipAreaStatus">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StatusText" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="256"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/SmokeCOAlarm.xml b/data_model/1.6/clusters/SmokeCOAlarm.xml
new file mode 100644
index 00000000000..a9cb9815dd0
--- /dev/null
+++ b/data_model/1.6/clusters/SmokeCOAlarm.xml
@@ -0,0 +1,332 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005C" name="Smoke CO Alarm Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Inoperative to ExpressedStateEnum and added Unmounted attribute"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005C" name="Smoke CO Alarm"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SMOKECO" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SMOKE" name="SmokeAlarm" summary="Supports Smoke alarm">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="CO" name="COAlarm" summary="Supports CO alarm">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AlarmStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the device is not alarming">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Warning state">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Critical" summary="Critical state">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ContaminationStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the sensor is not contaminated">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Low contamination">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Warning" summary="Warning state">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Critical" summary="Critical state, will cause nuisance alarms">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EndOfServiceEnum">
+      <item value="0" name="Normal" summary="Device has not expired">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Expired" summary="Device has reached its end of service">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ExpressedStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the device is not alarming">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="SmokeAlarm" summary="Smoke Alarm state">
+        <mandatoryConform>
+          <feature name="SMOKE"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="COAlarm" summary="CO Alarm state">
+        <mandatoryConform>
+          <feature name="CO"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="BatteryAlert" summary="Battery Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Testing" summary="Test in Progress">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="HardwareFault" summary="Hardware Fault Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="EndOfService" summary="End of Service Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="InterconnectSmoke" summary="Interconnected Smoke Alarm State">
+        <optionalConform/>
+      </item>
+      <item value="8" name="InterconnectCO" summary="Interconnected CO Alarm State">
+        <optionalConform/>
+      </item>
+      <item value="9" name="Inoperative" summary="Hardware is not able to detect Smoke or CO">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform>
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+        </otherwiseConform>
+      </item>
+    </enum>
+    <enum name="MuteStateEnum">
+      <item value="0" name="NotMuted" summary="Not Muted">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Muted" summary="Muted">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SensitivityEnum">
+      <item value="0" name="High" summary="High sensitivity">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Standard" summary="Standard Sensitivity">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Low" summary="Low sensitivity">
+        <optionalConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ExpressedState" type="ExpressedStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="SmokeState" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="SMOKE"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="COState" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="CO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="BatteryAlert" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="DeviceMuted" type="MuteStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="TestInProgress" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="HardwareFaultAlert" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0007" name="EndOfServiceAlert" type="EndOfServiceEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="InterconnectSmokeAlarm" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0009" name="InterconnectCOAlarm" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000A" name="ContaminationState" type="ContaminationStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000B" name="SmokeSensitivityLevel" type="SensitivityEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000C" name="ExpiryDate" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000D" name="Unmounted" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelfTestRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="SmokeAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SMOKE"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="COAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CO"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="LowBattery" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x03" name="HardwareFault" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x04" name="EndOfService" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x05" name="SelfTestComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x06" name="AlarmMuted" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x07" name="MuteEnded" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x08" name="InterconnectSmokeAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x09" name="InterconnectCOAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="CO"/>
+      </optionalConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x0A" name="AllClear" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/SoilMeasurement.xml b/data_model/1.6/clusters/SoilMeasurement.xml
new file mode 100644
index 00000000000..89065f9e3ba
--- /dev/null
+++ b/data_model/1.6/clusters/SoilMeasurement.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0430" name="Soil Measurement Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0430" name="Soil Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SOIL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="SoilMoistureMeasurementLimits" type="MeasurementAccuracyStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="SoilMoistureMeasuredValue" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="SoilMoistureMeasurementLimits">
+              <field name="MinMeasuredValue"/>
+            </attribute>
+          </from>
+          <to>
+            <attribute name="SoilMoistureMeasurementLimits">
+              <field name="MaxMeasuredValue"/>
+            </attribute>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Switch.xml b/data_model/1.6/clusters/Switch.xml
new file mode 100644
index 00000000000..5c989c7d8fa
--- /dev/null
+++ b/data_model/1.6/clusters/Switch.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003B" name="Switch Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Behavior clarifications for ambiguous combinations of events; Introduction of TotalNumberOfPressesCounted == 0 when MultiPressMax is exceeded; Introduction of ActionSwitch feature flag."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x003B" name="Switch"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="SWTCH" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LS" name="LatchingSwitch" summary="Switch is latching">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="MS" name="MomentarySwitch" summary="Switch is momentary">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="MSR" name="MomentarySwitchRelease" summary="Switch supports release events generation">
+      <optionalConform>
+        <andTerm>
+          <feature name="MS"/>
+          <notTerm>
+            <feature name="AS"/>
+          </notTerm>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="MSL" name="MomentarySwitchLongPress" summary="Switch supports long press detection">
+      <optionalConform>
+        <andTerm>
+          <feature name="MS"/>
+          <orTerm>
+            <feature name="MSR"/>
+            <feature name="AS"/>
+          </orTerm>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="MSM" name="MomentarySwitchMultiPress" summary="Switch supports multi-press detection">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+        <optionalConform>
+          <andTerm>
+            <feature name="MS"/>
+            <feature name="MSR"/>
+          </andTerm>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
+    <feature bit="5" code="AS" name="ActionSwitch" summary="Switch is momentary, targeted at specific user actions (focus on multi-press and optionally long press) with a reduced event generation scheme">
+      <optionalConform>
+        <feature name="MS"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="NumberOfPositions" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="2"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="CurrentPosition" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <attribute name="NumberOfPositions"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MultiPressMax" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MSM"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="2"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="SwitchLatched" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LS"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x01" name="InitialPress" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MS"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x02" name="LongPress" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSL"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="ShortRelease" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSR"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x04" name="LongRelease" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSL"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x05" name="MultiPressOngoing" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="MSM"/>
+          <notTerm>
+            <feature name="AS"/>
+          </notTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="CurrentNumberOfPressesCounted" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="2"/>
+            <to>
+              <attribute name="MultiPressMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x06" name="MultiPressComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSM"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to>
+              <compute>
+                <operation>subtract</operation>
+                <left>
+                  <attribute name="NumberOfPositions"/>
+                </left>
+                <right value="1"/>
+              </compute>
+            </to>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="TotalNumberOfPressesCounted" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max>
+            <attribute name="MultiPressMax"/>
+          </max>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/TLSCertificateManagement.xml b/data_model/1.6/clusters/TLSCertificateManagement.xml
new file mode 100644
index 00000000000..1033bd89555
--- /dev/null
+++ b/data_model/1.6/clusters/TLSCertificateManagement.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0801" name="TLS Certificate Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0801" name="TLS Certificate Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="TLSCERT" scope="Node"/>
+  <dataTypes>
+    <number name="TLSCAID" type="uint16"/>
+    <number name="TLSCCDID" type="uint16"/>
+    <struct name="TLSCertStruct">
+      <field id="0" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Certificate" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="3000"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="TLSClientCertificateDetailStruct">
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ClientCertificate" type="octstr">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="3000"/>
+        </constraint>
+      </field>
+      <field id="2" name="IntermediateCertificates" type="list">
+        <entry type="octstr">
+          <constraint>
+            <maxLength value="3000"/>
+          </constraint>
+        </entry>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxRootCertificates" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="5"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ProvisionedRootCertificates" type="list">
+      <entry type="TLSCertStruct"/>
+      <access read="true" readPrivilege="view" fabricSensitive="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="MaxRootCertificates"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxClientCertificates" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="2"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="ProvisionedClientCertificates" type="list">
+      <entry type="TLSClientCertificateDetailStruct"/>
+      <access read="true" readPrivilege="view" fabricSensitive="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="MaxClientCertificates"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ProvisionRootCertificate" direction="commandToServer" response="ProvisionRootCertificateResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Certificate" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="3000"/>
+        </constraint>
+      </field>
+      <field id="1" name="CAID" type="TLSCAID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ProvisionRootCertificateResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="FindRootCertificate" direction="commandToServer" response="FindRootCertificateResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CAID" type="TLSCAID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="FindRootCertificateResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CertificateDetails" type="list">
+        <entry type="TLSCertStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxRootCertificates"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="LookupRootCertificate" direction="commandToServer" response="LookupRootCertificateResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Fingerprint" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x05" name="LookupRootCertificateResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="RemoveRootCertificate" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="ClientCSR" direction="commandToServer" response="ClientCSRResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Nonce" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="CCDID" type="TLSCCDID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="ClientCSRResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="CSR" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="3000"/>
+        </constraint>
+      </field>
+      <field id="2" name="NonceSignature" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x09" name="ProvisionClientCertificate" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ClientCertificate" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="3000"/>
+        </constraint>
+      </field>
+      <field id="2" name="IntermediateCertificates" type="list">
+        <entry type="octstr">
+          <constraint>
+            <maxLength value="3000"/>
+          </constraint>
+        </entry>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="0"/>
+            <to value="10"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0A" name="FindClientCertificate" direction="commandToServer" response="FindClientCertificateResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0B" name="FindClientCertificateResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CertificateDetails" type="list">
+        <entry type="TLSClientCertificateDetailStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="MaxClientCertificates"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0C" name="LookupClientCertificate" direction="commandToServer" response="LookupClientCertificateResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Fingerprint" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0D" name="LookupClientCertificateResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x0E" name="RemoveClientCertificate" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CCDID" type="TLSCCDID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/TLSClientManagement.xml b/data_model/1.6/clusters/TLSClientManagement.xml
new file mode 100644
index 00000000000..09b2435539b
--- /dev/null
+++ b/data_model/1.6/clusters/TLSClientManagement.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0802" name="TLS Client Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0802" name="TLS Client Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="TLSCLIENT" scope="Node"/>
+  <dataTypes>
+    <number name="TLSEndpointID" type="uint16"/>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="EndpointAlreadyInstalled" summary="The endpoint is already installed.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x03" name="RootCertificateNotFound" summary="No root certificate exists for this CAID.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x04" name="ClientCertificateNotFound" summary="No client certificate exists for this CCDID.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x05" name="EndpointInUse" summary="The endpoint is in use and cannot be removed.">
+        <mandatoryConform/>
+      </item>
+      <item value="0x06" name="InvalidTime" summary="Time sync has not yet occurred.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="TLSEndpointStruct">
+      <field id="0" name="EndpointID" type="TLSEndpointID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Hostname" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="4"/>
+            <to value="253"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="2" name="Port" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="4" name="CCDID" type="TLSCCDID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="ReferenceCount" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxProvisioned" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="5"/>
+          <to value="254"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ProvisionedEndpoints" type="list">
+      <entry type="TLSEndpointStruct"/>
+      <access read="true" readPrivilege="view" fabricSensitive="true"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ProvisionEndpoint" direction="commandToServer" response="ProvisionEndpointResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Hostname" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="4"/>
+            <to value="253"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="1" name="Port" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="CAID" type="TLSCAID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="3" name="CCDID" type="TLSCCDID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EndpointID" type="TLSEndpointID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ProvisionEndpointResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="EndpointID" type="TLSEndpointID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="FindEndpoint" direction="commandToServer" response="FindEndpointResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="EndpointID" type="TLSEndpointID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="FindEndpointResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Endpoint" type="TLSEndpointStruct">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x04" name="RemoveEndpoint" direction="commandToServer" response="N">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="EndpointID" type="TLSEndpointID">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="0"/>
+            <to value="65534"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/TargetNavigator.xml b/data_model/1.6/clusters/TargetNavigator.xml
new file mode 100644
index 00000000000..8de38e8eee9
--- /dev/null
+++ b/data_model/1.6/clusters/TargetNavigator.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0505" name="Target Navigator Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add TargetUpdated event"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0505" name="Target Navigator"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TGTNAV" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="TargetNotFound" summary="Requested target was not found in the TargetList">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotAllowed" summary="Target request is not allowed in current state.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="TargetInfoStruct">
+      <field id="0" name="Identifier" type="uint8">
+        <mandatoryConform/>
+        <constraint>
+          <max value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TargetList" type="list">
+      <entry type="TargetInfoStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="0xFF">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="NavigateTarget" direction="commandToServer" response="NavigateTargetResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Target" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="NavigateTargetResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="TargetUpdated" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="TargetList" type="list">
+        <entry type="TargetInfoStruct"/>
+        <optionalConform/>
+      </field>
+      <field id="1" name="CurrentTarget" type="uint8" default="0xFF">
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Data" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="900"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/TemperatureAlarm.xml b/data_model/1.6/clusters/TemperatureAlarm.xml
new file mode 100644
index 00000000000..7b5b6f65d5e
--- /dev/null
+++ b/data_model/1.6/clusters/TemperatureAlarm.xml
@@ -0,0 +1,405 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0064" name="Temperature Alarm Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0064" name="Temperature Alarm">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Alarm Base" role="application" picsCode="TEMPALM" scope="Endpoint"/>
+  <features>
+    <feature bit="20" code="OVER" name="OverTemperature" summary="Supports activating alarms when a temperature measurement goes over a threshold">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="21" code="UNDER" name="UnderTemperature" summary="Supports activating alarms when a temperature measurement goes under a threshold">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="22" code="MAJOR" name="MajorThreshold" summary="Supports the major threshold for alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="23" code="MINOR" name="MinorThreshold" summary="Supports the minor threshold for alarms">
+      <optionalConform>
+        <feature name="MAJOR"/>
+      </optionalConform>
+    </feature>
+    <feature bit="24" code="OCRIADJ" name="OverCriticalAdjustable" summary="Supports the ability to adjust the over critical temperature threshold">
+      <optionalConform>
+        <feature name="OVER"/>
+      </optionalConform>
+    </feature>
+    <feature bit="25" code="OMAJADJ" name="OverMajorAdjustable" summary="Supports the ability to adjust the over major temperature threshold">
+      <optionalConform>
+        <andTerm>
+          <feature name="OVER"/>
+          <feature name="MAJOR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="26" code="OMINADJ" name="OverMinorAdjustable" summary="Supports the ability to adjust the over minor temperature threshold">
+      <optionalConform>
+        <andTerm>
+          <feature name="OVER"/>
+          <feature name="MINOR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="27" code="UMINADJ" name="UnderMinorAdjustable" summary="Supports the ability to adjust the under minor temperature threshold">
+      <optionalConform>
+        <andTerm>
+          <feature name="UNDER"/>
+          <feature name="MINOR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="28" code="UMAJADJ" name="UnderMajorAdjustable" summary="Supports the ability to adjust the under major temperature threshold">
+      <optionalConform>
+        <andTerm>
+          <feature name="UNDER"/>
+          <feature name="MAJOR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="29" code="UCRIADJ" name="UnderCriticalAdjustable" summary="Supports the ability to adjust the under critical temperature threshold">
+      <optionalConform>
+        <feature name="UNDER"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="AlarmBitmap">
+      <bitfield name="CriticalOverTemperatureAlarm" bit="0" summary="The measured temperature is above the critical threshold.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MajorOverTemperatureAlarm" bit="1" summary="The measured temperature is above the major threshold.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MinorOverTemperatureAlarm" bit="2" summary="The measured temperature is above the minor threshold.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MinorUnderTemperatureAlarm" bit="3" summary="The measured temperature is below the minor threshold.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MajorUnderTemperatureAlarm" bit="4" summary="The measured temperature is below the major threshold.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CriticalUnderTemperatureAlarm" bit="5" summary="The measured temperature is below the critical threshold.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0080" name="CriticalOverTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OVER"/>
+      </mandatoryConform>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <maxOf>
+                <attribute name="CriticalUnderTemperatureThreshold"/>
+                <attribute name="MajorOverTemperatureThreshold"/>
+                <attribute name="MinorOverTemperatureThreshold"/>
+              </maxOf>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0081" name="MajorOverTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="OVER"/>
+          <feature name="MAJOR"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <maxOf>
+                <attribute name="MajorUnderTemperatureThreshold"/>
+                <attribute name="MinorOverTemperatureThreshold"/>
+              </maxOf>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0082" name="MinorOverTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="OVER"/>
+          <feature name="MINOR"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <attribute name="MinorUnderTemperatureThreshold"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0083" name="MinorUnderTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="UNDER"/>
+          <feature name="MINOR"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <attribute name="MinorOverTemperatureThreshold"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0084" name="MajorUnderTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="UNDER"/>
+          <feature name="MAJOR"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <minOf>
+                <attribute name="MajorOverTemperatureThreshold"/>
+                <attribute name="MinorUnderTemperatureThreshold"/>
+              </minOf>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0085" name="CriticalUnderTemperatureThreshold" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="UNDER"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <minOf>
+                <attribute name="CriticalOverTemperatureThreshold"/>
+                <attribute name="MajorUnderTemperatureThreshold"/>
+                <attribute name="MinorUnderTemperatureThreshold"/>
+              </minOf>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x80" name="SetTemperatureAlarmThresholds" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="OCRIADJ"/>
+          <feature name="OMAJADJ"/>
+          <feature name="OMINADJ"/>
+          <feature name="UMINADJ"/>
+          <feature name="UMAJADJ"/>
+          <feature name="UCRIADJ"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="CriticalOverTemperatureThreshold" type="temperature">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="OCRIADJ"/>
+        </optionalConform>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <maxOf>
+                  <field name="CriticalUnderTemperatureThreshold"/>
+                  <field name="MajorOverTemperatureThreshold"/>
+                  <field name="MinorOverTemperatureThreshold"/>
+                </maxOf>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="1" name="MajorOverTemperatureThreshold" type="temperature">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="OMAJADJ"/>
+        </optionalConform>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <maxOf>
+                  <field name="MajorUnderTemperatureThreshold"/>
+                  <field name="MinorOverTemperatureThreshold"/>
+                </maxOf>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="2" name="MinorOverTemperatureThreshold" type="temperature" default="32765">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="OMINADJ"/>
+        </optionalConform>
+        <constraint>
+          <min>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <field name="MinorUnderTemperatureThreshold"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </min>
+        </constraint>
+      </field>
+      <field id="3" name="MinorUnderTemperatureThreshold" type="temperature" default="-27314">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="UMINADJ"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left>
+                <field name="MinorOverTemperatureThreshold"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="4" name="MajorUnderTemperatureThreshold" type="temperature">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="UMAJADJ"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left>
+                <minOf>
+                  <field name="MajorOverTemperatureThreshold"/>
+                  <field name="MinorUnderTemperatureThreshold"/>
+                </minOf>
+              </left>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+      <field id="5" name="CriticalUnderTemperatureThreshold" type="temperature">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="UCRIADJ"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <compute>
+              <operation>subtract</operation>
+              <left>
+                <minOf>
+                  <field name="CriticalOverTemperatureThreshold"/>
+                  <field name="MajorUnderTemperatureThreshold"/>
+                  <field name="MinorUnderTemperatureThreshold"/>
+                </minOf>
+              </left>
+              <right value="1"/>
+            </compute>
+          </max>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/TemperatureControl.xml b/data_model/1.6/clusters/TemperatureControl.xml
new file mode 100644
index 00000000000..92f8be5084c
--- /dev/null
+++ b/data_model/1.6/clusters/TemperatureControl.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0056" name="Temperature Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0056" name="Temperature Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TCTL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TN" name="TemperatureNumber" summary="Use actual temperature numbers">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TL" name="TemperatureLevel" summary="Use temperature levels">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="STEP" name="TemperatureStep" summary="Use step control with temperature numbers">
+      <optionalConform>
+        <feature name="TN"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="TemperatureSetpoint" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TN"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinTemperature"/>
+          </from>
+          <to>
+            <attribute name="MaxTemperature"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinTemperature" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TN"/>
+      </mandatoryConform>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left>
+              <attribute name="MaxTemperature"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxTemperature" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TN"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Step" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="STEP"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to>
+            <compute>
+              <operation>subtract</operation>
+              <left>
+                <attribute name="MaxTemperature"/>
+              </left>
+              <right>
+                <attribute name="MinTemperature"/>
+              </right>
+            </compute>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="SelectedTemperatureLevel" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TL"/>
+      </mandatoryConform>
+      <constraint>
+        <max value="31"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="SupportedTemperatureLevels" type="list">
+      <entry type="string">
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TL"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount value="32"/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetTemperature" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="TargetTemperature" type="temperature">
+        <mandatoryConform>
+          <feature name="TN"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="TargetTemperatureLevel" type="uint8">
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/TemperatureMeasurement.xml b/data_model/1.6/clusters/TemperatureMeasurement.xml
new file mode 100644
index 00000000000..ccf9f909c1a
--- /dev/null
+++ b/data_model/1.6/clusters/TemperatureMeasurement.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0402" name="Temperature Measurement Cluster" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="CCB 2823"/>
+    <revision revision="4" summary="New data model format and notation"/>
+    <revision revision="5" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0402" name="Temperature Measurement"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TMP" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-27315"/>
+          <to value="32766"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min>
+          <compute>
+            <operation>add</operation>
+            <left>
+              <attribute name="MinMeasuredValue"/>
+            </left>
+            <right value="1"/>
+          </compute>
+        </min>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/Thermostat.xml b/data_model/1.6/clusters/Thermostat.xml
new file mode 100644
index 00000000000..fd47111e8ef
--- /dev/null
+++ b/data_model/1.6/clusters/Thermostat.xml
@@ -0,0 +1,1528 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0201" name="Thermostat Cluster" revision="11">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; fixed some defaults; CCB 1823, 1480"/>
+    <revision revision="2" summary="CCB 1981 2186 2249 2250 2251; NFR Thermostat Setback"/>
+    <revision revision="3" summary="CCB 2477 2560 2773 2777 2815 2816 3029"/>
+    <revision revision="4" summary="All Hubs changes"/>
+    <revision revision="5" summary="New data model format and notation, added FeatureMap, collapsed attribute sets, clarified edge cases around limits, default value of xxxSetpointLimit now respects AbsxxxSetpointLimit"/>
+    <revision revision="6" summary="Introduced the LTNE feature and adapted text (spec issue #5778)"/>
+    <revision revision="7" summary="Update constraints on local temperature calibration and minimum setpoint deadband and introduced Presets and MatterScheduleConfiguration features"/>
+    <revision revision="8" summary="Added comment regarding writing to ControlSequenceOfOperation."/>
+    <revision revision="9" summary="Removed AlarmMask attribute and AlarmCodeBitmap Type."/>
+    <revision revision="10" summary="Removed Zigbee related elements and P quality, deprecated ThermostatProgrammingOperationMode and removed ProgrammingOperationModeBitmap. and deprecated Setback feature and related elements."/>
+    <revision revision="11"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0201" name="Thermostat"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TSTAT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="HEAT" name="Heating" summary="Thermostat is capable of managing a heating device">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+        <optionalConform choice="a" more="true" min="1"/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="1" code="COOL" name="Cooling" summary="Thermostat is capable of managing a cooling device">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+        <optionalConform choice="a" more="true" min="1"/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="OCC" name="Occupancy" summary="Supports Occupied and Unoccupied setpoints">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="SB" name="Setback">
+      <deprecateConform/>
+    </feature>
+    <feature bit="5" code="AUTO" name="AutoMode" summary="Supports a System Mode of Auto">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="LTNE" name="LocalTemperatureNotExposed" summary="Thermostat does not expose the LocalTemperature Value in the LocalTemperature attribute">
+      <optionalConform/>
+    </feature>
+    <feature bit="7" code="MSCH" name="MatterScheduleConfiguration" summary="Supports enhanced schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="8" code="PRES" name="Presets" summary="Thermostat supports setpoint presets">
+      <optionalConform/>
+    </feature>
+    <feature bit="9" code="TEVT" name="Events" summary="Thermostat supports events">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="10" code="TSUGGEST" name="Thermostat Suggestions" summary="Thermostat supports suggestions">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <feature name="PRES"/>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="SignedTemperature" type="int8"/>
+    <number name="TemperatureDifference" type="int16"/>
+    <number name="UnsignedTemperature" type="uint8"/>
+    <enum name="ACCapacityFormatEnum">
+      <item value="0" name="BTUh" summary="British Thermal Unit per Hour">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACCompressorTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown compressor type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="T1" summary="Max working ambient 43 °C">
+        <optionalConform/>
+      </item>
+      <item value="2" name="T2" summary="Max working ambient 35 °C">
+        <optionalConform/>
+      </item>
+      <item value="3" name="T3" summary="Max working ambient 52 °C">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACLouverPositionEnum">
+      <item value="1" name="Closed" summary="Fully Closed">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Open" summary="Fully Open">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Quarter" summary="Quarter Open">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Half" summary="Half Open">
+        <optionalConform/>
+      </item>
+      <item value="5" name="ThreeQuarters" summary="Three Quarters Open">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACRefrigerantTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown Refrigerant Type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="R22" summary="R22 Refrigerant">
+        <optionalConform/>
+      </item>
+      <item value="2" name="R410a" summary="R410a Refrigerant">
+        <optionalConform/>
+      </item>
+      <item value="3" name="R407c" summary="R407c Refrigerant">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown AC Type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="CoolingFixed" summary="Cooling and Fixed Speed">
+        <optionalConform/>
+      </item>
+      <item value="2" name="HeatPumpFixed" summary="Heat Pump and Fixed Speed">
+        <optionalConform/>
+      </item>
+      <item value="3" name="CoolingInverter" summary="Cooling and Inverter">
+        <optionalConform/>
+      </item>
+      <item value="4" name="HeatPumpInverter" summary="Heat Pump and Inverter">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ControlSequenceOfOperationEnum">
+      <item value="0" name="CoolingOnly" summary="Heat and Emergency are not possible">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="1" name="CoolingWithReheat" summary="Heat and Emergency are not possible">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="HeatingOnly" summary="Cool and precooling (see Terms) are not possible">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="HeatingWithReheat" summary="Cool and precooling are not possible">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="CoolingAndHeating" summary="All modes are possible">
+        <optionalConform>
+          <andTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </andTerm>
+        </optionalConform>
+      </item>
+      <item value="5" name="CoolingAndHeatingWithReheat" summary="All modes are possible">
+        <optionalConform>
+          <andTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </andTerm>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="PresetScenarioEnum">
+      <item value="1" name="Occupied" summary="The thermostat-controlled area is occupied">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Unoccupied" summary="The thermostat-controlled area is unoccupied">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Sleep" summary="Users are likely to be sleeping">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Wake" summary="Users are likely to be waking up">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Vacation" summary="Users are on vacation">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="GoingToSleep" summary="Users are likely to be going to sleep">
+        <mandatoryConform/>
+      </item>
+      <item value="254" name="UserDefined" summary="Custom presets">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SetpointChangeSourceEnum">
+      <item value="0" name="Manual" summary="Manual, user-initiated setpoint change via the thermostat">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Schedule" summary="Schedule/internal programming-initiated setpoint change">
+        <optionalConform>
+          <feature name="MSCH"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="External" summary="Externally-initiated setpoint change (e.g., DRLC cluster command, attribute write)">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="SetpointRaiseLowerModeEnum">
+      <item value="0" name="Heat" summary="Adjust Heat Setpoint">
+        <mandatoryConform>
+          <feature name="HEAT"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Cool" summary="Adjust Cool Setpoint">
+        <mandatoryConform>
+          <feature name="COOL"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Both" summary="Adjust Heat Setpoint and Cool Setpoint">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="StartOfWeekEnum">
+      <item value="0" name="Sunday">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Monday">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Tuesday">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Wednesday">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Thursday">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Friday">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Saturday">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SystemModeEnum">
+      <item value="0" name="Off" summary="The Thermostat does not generate demand for Cooling or Heating">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Auto" summary="Demand is generated for either Cooling or Heating, as required">
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Cool" summary="Demand is only generated for Cooling">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="Heat" summary="Demand is only generated for Heating">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="EmergencyHeat" summary="2nd stage heating is in use to achieve desired temperature">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="6" name="Precooling" summary="(see Terms)">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="FanOnly">
+        <optionalConform/>
+      </item>
+      <item value="8" name="Dry">
+        <optionalConform/>
+      </item>
+      <item value="9" name="Sleep">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="TemperatureSetpointHoldEnum">
+      <item value="0" name="SetpointHoldOff" summary="Follow scheduling program">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="SetpointHoldOn" summary="Maintain current setpoint, regardless of schedule transitions">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ThermostatRunningModeEnum">
+      <item value="0" name="Off" summary="The Thermostat does not generate demand for Cooling or Heating">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Cool" summary="Demand is only generated for Cooling">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="Heat" summary="Demand is only generated for Heating">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <bitmap name="ACErrorCodeBitmap">
+      <bitfield name="CompressorFail" bit="0" summary="Compressor Failure or Refrigerant Leakage">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RoomSensorFail" bit="1" summary="Room Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OutdoorSensorFail" bit="2" summary="Outdoor Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoilSensorFail" bit="3" summary="Indoor Coil Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanFail" bit="4" summary="Fan Failure">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OccupancyBitmap">
+      <bitfield name="Occupied" bit="0" summary="Indicates the occupancy state">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="PresetTypeFeaturesBitmap">
+      <bitfield name="Automatic" bit="0" summary="Preset may be automatically activated by the thermostat">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SupportsNames" bit="1" summary="Preset supports user-provided names">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="RelayStateBitmap">
+      <bitfield name="Heat" bit="0" summary="Heat Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Cool" bit="1" summary="Cool Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Fan" bit="2" summary="Fan Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatStage2" bit="3" summary="Heat 2nd Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoolStage2" bit="4" summary="Cool 2nd Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanStage2" bit="5" summary="Fan 2nd Stage On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanStage3" bit="6" summary="Fan 3rd Stage On">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="RemoteSensingBitmap">
+      <bitfield name="LocalTemperature" bit="0" summary="Calculated Local Temperature is derived from a remote node">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OutdoorTemperature" bit="1" summary="OutdoorTemperature is derived from a remote node">
+        <mandatoryConform>
+          <attribute name="OutdoorTemperature"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Occupancy" bit="2" summary="Occupancy is derived from a remote node">
+        <mandatoryConform>
+          <feature name="OCC"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ScheduleDayOfWeekBitmap">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Away" bit="7" summary="Away or Vacation">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ScheduleModeBitmap">
+      <bitfield name="HeatSetpointPresent" bit="0" summary="Adjust Heat Setpoint">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoolSetpointPresent" bit="1" summary="Adjust Cool Setpoint">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ScheduleTypeFeaturesBitmap">
+      <bitfield name="SupportsPresets" bit="0" summary="Supports presets">
+        <optionalConform choice="b" more="true" min="1">
+          <feature name="PRES"/>
+        </optionalConform>
+      </bitfield>
+      <bitfield name="SupportsSetpoints" bit="1" summary="Supports setpoints">
+        <optionalConform choice="b" more="true" min="1"/>
+      </bitfield>
+      <bitfield name="SupportsNames" bit="2" summary="Supports user-provided names">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="SupportsOff" bit="3" summary="Supports transitioning to SystemModeOff">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ThermostatSuggestionNotFollowingReasonBitmap">
+      <bitfield name="DemandResponseEvent" bit="0" summary="Thermostat is responding to a Demand Response event">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="OngoingHold" bit="1" summary="Thermostat has an ongoing setpoint hold">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="Schedule" bit="2" summary="Thermostat is following a schedule">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="Occupancy" bit="3" summary="Thermostat is following the occupancy signal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="VacationMode" bit="4" summary="Thermostat is set to Vacation mode">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="TimeOfUseCostSavings" bit="5" summary="Thermostat is following a Time Of Use based cost savings plan">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="PreCoolingOrPreHeating" bit="6" summary="Thermostat is precooling or preheating based on an energy forecast signal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="ConflictingSuggestions" bit="7" summary="Thermostat has conflicting suggestions and is unable to choose one">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </bitfield>
+    </bitmap>
+    <struct name="PresetStruct">
+      <field id="0" name="PresetHandle" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="PresetScenario" type="PresetScenarioEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Name" type="string" default="null">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="3" name="CoolingSetpoint" type="temperature" default="2600">
+        <mandatoryConform>
+          <feature name="COOL"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="HeatingSetpoint" type="temperature" default="2000">
+        <mandatoryConform>
+          <feature name="HEAT"/>
+        </mandatoryConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="BuiltIn" type="bool" default="false">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="PresetTypeStruct">
+      <field id="0" name="PresetScenario" type="PresetScenarioEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NumberOfPresets" type="uint8" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="PresetTypeFeatures" type="PresetTypeFeaturesBitmap" default="0">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ScheduleStruct">
+      <field id="0" name="ScheduleHandle" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="SystemMode" type="SystemModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="Name" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+      <field id="3" name="PresetHandle" type="octstr">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="4" name="Transitions" type="list" default="empty">
+        <entry type="ScheduleTransitionStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to>
+              <attribute name="NumberOfScheduleTransitions"/>
+            </to>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="5" name="BuiltIn" type="bool" default="false">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ScheduleTransitionStruct">
+      <field id="0" name="DayOfWeek" type="ScheduleDayOfWeekBitmap">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="1439"/>
+        </constraint>
+      </field>
+      <field id="2" name="PresetHandle" type="octstr">
+        <optionalConform>
+          <feature name="PRES"/>
+        </optionalConform>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="3" name="SystemMode" type="SystemModeEnum">
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="CoolingSetpoint" type="temperature">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="5" name="HeatingSetpoint" type="temperature">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ScheduleTypeStruct">
+      <field id="0" name="SystemMode" type="SystemModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="NumberOfSchedules" type="uint8" default="0">
+        <mandatoryConform/>
+        <constraint>
+          <max>
+            <attribute name="NumberOfSchedules"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="2" name="ScheduleTypeFeatures" type="ScheduleTypeFeaturesBitmap" default="0">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ThermostatSuggestionStruct">
+      <field id="0" name="UniqueID" type="uint8">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+      <field id="1" name="PresetHandle" type="octstr">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="2" name="EffectiveTime" type="epoch-s">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+      <field id="3" name="ExpirationTime" type="epoch-s">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+    </struct>
+    <struct name="WeeklyScheduleTransitionStruct">
+      <field id="0" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <max value="1439"/>
+        </constraint>
+      </field>
+      <field id="1" name="HeatSetpoint" type="temperature">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="CoolSetpoint" type="temperature">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LocalTemperature" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="OutdoorTemperature" type="temperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="Occupancy" type="OccupancyBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OCC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="AbsMinHeatSetpointLimit" type="temperature" default="700">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="AbsMaxHeatSetpointLimit" type="temperature" default="3000">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="AbsMinCoolSetpointLimit" type="temperature" default="1600">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="AbsMaxCoolSetpointLimit" type="temperature" default="3200">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0007" name="PICoolingDemand">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0008" name="PIHeatingDemand">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0009" name="HVACSystemTypeConfiguration">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0010" name="LocalTemperatureCalibration" type="SignedTemperature" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <notTerm>
+          <feature name="LTNE"/>
+        </notTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0011" name="OccupiedCoolingSetpoint" type="temperature" default="2600">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="COOL"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0012" name="OccupiedHeatingSetpoint" type="temperature" default="2000">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="HEAT"/>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0013" name="UnoccupiedCoolingSetpoint" type="temperature" default="2600">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="COOL"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0014" name="UnoccupiedHeatingSetpoint" type="temperature" default="2000">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="HEAT"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0015" name="MinHeatSetpointLimit" type="temperature">
+      <default>
+        <attribute name="AbsMinHeatSetpointLimit"/>
+      </default>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0016" name="MaxHeatSetpointLimit" type="temperature">
+      <default>
+        <attribute name="AbsMaxHeatSetpointLimit"/>
+      </default>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0017" name="MinCoolSetpointLimit" type="temperature">
+      <default>
+        <attribute name="AbsMinCoolSetpointLimit"/>
+      </default>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0018" name="MaxCoolSetpointLimit" type="temperature">
+      <default>
+        <attribute name="AbsMaxCoolSetpointLimit"/>
+      </default>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0019" name="MinSetpointDeadBand" type="SignedTemperature" default="20">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="AUTO"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="127"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x001A" name="RemoteSensing" type="RemoteSensingBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x001B" name="ControlSequenceOfOperation" type="ControlSequenceOfOperationEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001C" name="SystemMode" type="SystemModeEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001E" name="ThermostatRunningMode" type="ThermostatRunningModeEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <feature name="AUTO"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="AUTO"/>
+        </optionalConform>
+      </otherwiseConform>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0023" name="TemperatureSetpointHold" type="TemperatureSetpointHoldEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0024" name="TemperatureSetpointHoldDuration" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <max value="1440"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0025" name="ThermostatProgrammingOperationMode">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0029" name="ThermostatRunningState" type="RelayStateBitmap">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0030" name="SetpointChangeSource" type="SetpointChangeSourceEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0031" name="SetpointChangeAmount" type="int16s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0032" name="SetpointChangeSourceTimestamp" type="epoch-s" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0034" name="OccupiedSetback">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0035" name="OccupiedSetbackMin">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0036" name="OccupiedSetbackMax">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0037" name="UnoccupiedSetback">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0038" name="UnoccupiedSetbackMin">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0039" name="UnoccupiedSetbackMax">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x003A" name="EmergencyHeatDelta" type="UnsignedTemperature" default="255">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0040" name="ACType" type="ACTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0041" name="ACCapacity" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0042" name="ACRefrigerantType" type="ACRefrigerantTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0043" name="ACCompressorType" type="ACCompressorTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0044" name="ACErrorCode" type="ACErrorCodeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0045" name="ACLouverPosition" type="ACLouverPositionEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0046" name="ACCoilTemperature" type="temperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0047" name="ACCapacityFormat" type="ACCapacityFormatEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0048" name="PresetTypes" type="list">
+      <entry type="PresetTypeStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PRES"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="7"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0049" name="ScheduleTypes" type="list">
+      <entry type="ScheduleTypeStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="3"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x004A" name="NumberOfPresets" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="PRES"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x004B" name="NumberOfSchedules" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x004C" name="NumberOfScheduleTransitions" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x004D" name="NumberOfScheduleTransitionPerDay" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x004E" name="ActivePresetHandle" type="octstr">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="PRES"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x004F" name="ActiveScheduleHandle" type="octstr">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0050" name="Presets" type="list">
+      <entry type="PresetStruct"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile" atomicWrite="true"/>
+      <mandatoryConform>
+        <feature name="PRES"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount>
+          <attribute name="NumberOfPresets"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0051" name="Schedules" type="list">
+      <entry type="ScheduleStruct"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile" atomicWrite="true"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <constraint>
+        <maxCount>
+          <attribute name="NumberOfSchedules"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0052" name="SetpointHoldExpiryTimestamp" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0053" name="MaxThermostatSuggestions" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <min value="5"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0054" name="ThermostatSuggestions" type="list">
+      <entry type="ThermostatSuggestionStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <maxCount>
+          <attribute name="MaxThermostatSuggestions"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0055" name="CurrentThermostatSuggestion" type="ThermostatSuggestionStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0056" name="ThermostatSuggestionNotFollowingReason" type="ThermostatSuggestionNotFollowingReasonBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetpointRaiseLower" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Mode" type="SetpointRaiseLowerModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="Amount" type="int8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="AddThermostatSuggestionResponse" direction="responseFromServer">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="UniqueID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="SetActiveScheduleRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="MSCH"/>
+      </mandatoryConform>
+      <field id="0" name="ScheduleHandle" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="SetActivePresetRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PRES"/>
+      </mandatoryConform>
+      <field id="0" name="PresetHandle" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x07" name="AddThermostatSuggestion" direction="commandToServer" response="AddThermostatSuggestionResponse">
+      <access invokePrivilege="manage"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PresetHandle" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="EffectiveTime" type="epoch-s">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="2" name="ExpirationInMinutes" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="30"/>
+            <to value="1440"/>
+          </between>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="RemoveThermostatSuggestion" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TSUGGEST"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="UniqueID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="SystemModeChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TEVT"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousSystemMode" type="SystemModeEnum">
+        <optionalConform/>
+      </field>
+      <field id="1" name="CurrentSystemMode" type="SystemModeEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="LocalTemperatureChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <notTerm>
+              <feature name="LTNE"/>
+            </notTerm>
+          </andTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="CurrentLocalTemperature" type="temperature">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="OccupancyChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <feature name="OCC"/>
+          </andTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousOccupancy" type="OccupancyBitmap">
+        <optionalConform/>
+      </field>
+      <field id="1" name="CurrentOccupancy" type="OccupancyBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x03" name="SetpointChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TEVT"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="SystemMode" type="SystemModeEnum">
+        <mandatoryConform/>
+        <constraint>
+          <allowed>
+            <enum value="Heat"/>
+          </allowed>
+        </constraint>
+        <constraint>
+          <allowed>
+            <enum value="Cool"/>
+          </allowed>
+        </constraint>
+      </field>
+      <field id="1" name="Occupancy" type="OccupancyBitmap" default="1">
+        <mandatoryConform>
+          <feature name="OCC"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="PreviousSetpoint" type="temperature">
+        <optionalConform/>
+      </field>
+      <field id="3" name="CurrentSetpoint" type="temperature">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x04" name="RunningStateChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TEVT"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousRunningState" type="RelayStateBitmap">
+        <optionalConform/>
+      </field>
+      <field id="1" name="CurrentRunningState" type="RelayStateBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x05" name="RunningModeChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <feature name="AUTO"/>
+          </andTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousRunningMode" type="ThermostatRunningModeEnum">
+        <optionalConform/>
+      </field>
+      <field id="1" name="CurrentRunningMode" type="ThermostatRunningModeEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x06" name="ActiveScheduleChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <feature name="MSCH"/>
+          </andTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousScheduleHandle" type="octstr">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="CurrentScheduleHandle" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x07" name="ActivePresetChange" priority="info">
+      <access readPrivilege="view"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TEVT"/>
+            <feature name="PRES"/>
+          </andTerm>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="PreviousPresetHandle" type="octstr">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="1" name="CurrentPresetHandle" type="octstr">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/ThermostatUserInterfaceConfiguration.xml b/data_model/1.6/clusters/ThermostatUserInterfaceConfiguration.xml
new file mode 100644
index 00000000000..2f7b9f41fee
--- /dev/null
+++ b/data_model/1.6/clusters/ThermostatUserInterfaceConfiguration.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0204" name="Thermostat User Interface Configuration Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="New data model format and notation, added &quot;Conversion of Temperature Values for Display&quot; section"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0204" name="Thermostat User Interface Configuration"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TSUIC" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="KeypadLockoutEnum">
+      <item value="0" name="NoLockout" summary="All functionality available to the user">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Lockout1" summary="Level 1 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Lockout2" summary="Level 2 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Lockout3" summary="Level 3 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Lockout4" summary="Level 4 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Lockout5" summary="Least functionality available to the user">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ScheduleProgrammingVisibilityEnum">
+      <item value="0" name="ScheduleProgrammingPermitted" summary="Local schedule programming functionality is enabled at the thermostat">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ScheduleProgrammingDenied" summary="Local schedule programming functionality is disabled at the thermostat">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TemperatureDisplayModeEnum">
+      <item value="0" name="Celsius" summary="Temperature displayed in °C">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Fahrenheit" summary="Temperature displayed in °F">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TemperatureDisplayMode" type="TemperatureDisplayModeEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="KeypadLockout" type="KeypadLockoutEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ScheduleProgrammingVisibility" type="ScheduleProgrammingVisibilityEnum">
+      <default>
+        <enum default="ScheduleProgrammingPermitted"/>
+      </default>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ThreadBorderRouterDiagnostics.xml b/data_model/1.6/clusters/ThreadBorderRouterDiagnostics.xml
new file mode 100644
index 00000000000..fa11bbba4f3
--- /dev/null
+++ b/data_model/1.6/clusters/ThreadBorderRouterDiagnostics.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0454" name="Thread Border Router Diagnostics Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0454" name="Thread Border Router Diagnostics">
+      <provisionalConform/>
+    </clusterId>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TBRD" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="BorderRouterOperationalStatusEnum">
+      <item value="0" name="Running" summary="Border routing service is active and operational">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Stopped" summary="Border routing service is not operational due to fault or error">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Disabled" summary="Border routing service is not operational due to administrative configuration">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ThreadBorderRouterFaultEnum">
+      <item value="0" name="BrGeneralFault" summary="Indicates a generic unspecified fault related to the Border Router function.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AdjacentInfraIfFault" summary="Indicates the adjacent infrastructure interface cannot be used for border routing.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ServicesAtCapacity" summary="Indicates that a service or function associated with border routing has reached its maximum capacity (e.g., SRP server table full).">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ChildrenAtCapacity" summary="Indicates that the Thread Border Router has reached its maximum supported number of direct MTD children.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="BrStatus" type="BorderRouterOperationalStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveTbrFaultsList" type="list">
+      <entry type="ThreadBorderRouterFaultEnum"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="4"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ThreadBorderRouterManagement.xml b/data_model/1.6/clusters/ThreadBorderRouterManagement.xml
new file mode 100644
index 00000000000..9cc69f53df1
--- /dev/null
+++ b/data_model/1.6/clusters/ThreadBorderRouterManagement.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0452" name="Thread Border Router Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0452" name="Thread Border Router Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="TBRM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PC" name="PANChange" summary="The ability to change PAN configuration with pending dataset setting request.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="BorderRouterName" type="string">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="63"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="BorderAgentID" type="octstr">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="16"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ThreadVersion" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="InterfaceEnabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="ActiveDatasetTimestamp" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="PendingDatasetTimestamp" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="GetActiveDatasetRequest" direction="commandToServer" response="DatasetResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="GetPendingDatasetRequest" direction="commandToServer" response="DatasetResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="DatasetResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Dataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="SetActiveDatasetRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ActiveDataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x04" name="SetPendingDatasetRequest" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform>
+        <feature name="PC"/>
+      </mandatoryConform>
+      <field id="0" name="PendingDataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ThreadNetworkDirectory.xml b/data_model/1.6/clusters/ThreadNetworkDirectory.xml
new file mode 100644
index 00000000000..49edc8952c0
--- /dev/null
+++ b/data_model/1.6/clusters/ThreadNetworkDirectory.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0453" name="Thread Network Directory Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0453" name="Thread Network Directory"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="THNETDIR" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="ThreadNetworkStruct">
+      <field id="0" name="ExtendedPanID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+      </field>
+      <field id="1" name="NetworkName" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+      <field id="2" name="Channel" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="ActiveTimestamp" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PreferredExtendedPanID" type="octstr">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <allowed value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="ThreadNetworks" type="list">
+      <entry type="ThreadNetworkStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount>
+          <attribute name="ThreadNetworkTableSize"/>
+        </maxCount>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="ThreadNetworkTableSize" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddNetwork" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="OperationalDataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="RemoveNetwork" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ExtendedPanID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x02" name="GetOperationalDataset" direction="commandToServer" response="OperationalDatasetResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="ExtendedPanID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <allowed value="8"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="OperationalDatasetResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="OperationalDataset" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="254"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/TimeSync.xml b/data_model/1.6/clusters/TimeSync.xml
new file mode 100644
index 00000000000..74c130ff526
--- /dev/null
+++ b/data_model/1.6/clusters/TimeSync.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0038" name="Time Synchronization Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Make TrustedTimeSource fabric-aware, add TSC feature, define list max sizes, change writable attributes to commands, remote port, add attribute for DNS support"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0038" name="Time Synchronization"/>
+  </clusterIds>
+  <classification hierarchy="base" role="utility" picsCode="TIMESYNC" scope="Node"/>
+  <features>
+    <feature bit="0" code="TZ" name="TimeZone" summary="Server supports time zone.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="NTPC" name="NTPClient" summary="Server supports an NTP or SNTP client.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="NTPS" name="NTPServer" summary="Server supports an NTP server role.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="TSC" name="TimeSyncClient" summary="Time synchronization client cluster is present.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="GranularityEnum">
+      <item value="0" name="NoTimeGranularity" summary="This indicates that the node is not currently synchronized with a UTC Time source and its clock is based on the Last Known Good UTC Time only.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MinutesGranularity" summary="This indicates the node was synchronized to an upstream source in the past, but sufficient clock drift has occurred such that the clock error is now &gt; 5 seconds.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a low resolution protocol. UTC Time is accurate to ± 5 seconds.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50 ms.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="MicrosecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a highly precise time-synchronization protocol such as PTP, or has built-in GNSS. UTC time is accurate to ± 10 μs.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="TimeNotAccepted" summary="Node rejected the attempt to set the UTC time">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TimeSourceEnum">
+      <item value="0" name="None" summary="Node is not currently synchronized with a UTC Time source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Unknown" summary="Node uses an unlisted time source.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Admin" summary="Node received time from a client using the SetUTCTime Command.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NodeTimeCluster" summary="Synchronized time by querying the Time Synchronization cluster of another Node.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="NonMatterSNTP" summary="SNTP from a server not in the Matter network. NTS is not used.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="NonMatterNTP" summary="NTP from servers not in the Matter network. None of the servers used NTS.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="MatterSNTP" summary="SNTP from a server within the Matter network. NTS is not used.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="MatterNTP" summary="NTP from servers within the Matter network. None of the servers used NTS.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="MixedNTP" summary="NTP from multiple servers in the Matter network and external. None of the servers used NTS.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="NonMatterSNTPNTS" summary="SNTP from a server not in the Matter network. NTS is used.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="NonMatterNTPNTS" summary="NTP from servers not in the Matter network. NTS is used on at least one server.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="MatterSNTPNTS" summary="SNTP from a server within the Matter network. NTS is used.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="MatterNTPNTS" summary="NTP from a server within the Matter network. NTS is used on at least one server.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="MixedNTPNTS" summary="NTP from multiple servers in the Matter network and external. NTS is used on at least one server.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="CloudSource" summary="Time synchronization comes from a vendor cloud-based source (e.g. &quot;Date&quot; header in authenticated HTTPS connection).">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="PTP" summary="Time synchronization comes from PTP.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="GNSS" summary="Time synchronization comes from a GNSS source.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TimeZoneDatabaseEnum">
+      <item value="0" name="Full" summary="Node has a full list of the available time zones">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Partial" summary="Node has a partial list of the available time zones">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="None" summary="Node does not have a time zone database">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="DSTOffsetStruct">
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="1" name="ValidStarting" type="epoch-us">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ValidUntil" type="epoch-us">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="FabricScopedTrustedTimeSourceStruct">
+      <field id="0" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TimeZoneStruct">
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-43200"/>
+            <to value="50400"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="ValidAt" type="epoch-us">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Name" type="string">
+        <optionalConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="0"/>
+            <to value="64"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="TrustedTimeSourceStruct">
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="UTCTime" type="epoch-us" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Granularity" type="GranularityEnum">
+      <default>
+        <enum default="NoTimeGranularity"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="TimeSource" type="TimeSourceEnum">
+      <default>
+        <enum default="None"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="TrustedTimeSource" type="TrustedTimeSourceStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TSC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="DefaultNTP" type="string" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="NTPC"/>
+      </mandatoryConform>
+      <constraint>
+        <maxLength value="128"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="TimeZone" type="list">
+      <entry type="TimeZoneStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="2"/>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="DSTOffset" type="list" default="empty">
+      <entry type="DSTOffsetStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="LocalTime" type="epoch-us" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="TimeZoneDatabase" type="TimeZoneDatabaseEnum">
+      <default>
+        <enum default="None"/>
+      </default>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="NTPServerAvailable" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="NTPS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000A" name="TimeZoneListMaxSize" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="2"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="DSTOffsetListMaxSize" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000C" name="SupportsDNSResolve" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="NTPC"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetUTCTime" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="UTCTime" type="epoch-us" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Granularity" type="GranularityEnum">
+        <default>
+          <enum default="NoTimeGranularity"/>
+        </default>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TimeSource" type="TimeSourceEnum">
+        <default>
+          <enum default="None"/>
+        </default>
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="SetTrustedTimeSource" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="TSC"/>
+      </mandatoryConform>
+      <field id="0" name="TrustedTimeSource" type="FabricScopedTrustedTimeSourceStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="SetTimeZone" direction="commandToServer" response="SetTimeZoneResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="TimeZone" type="list">
+        <entry type="TimeZoneStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="2"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="SetTimeZoneResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="DSTOffsetRequired" type="bool" default="true">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="SetDSTOffset" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="DSTOffset" type="list">
+        <entry type="DSTOffsetStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="SetDefaultNTP" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="NTPC"/>
+      </mandatoryConform>
+      <field id="0" name="DefaultNTP" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="DSTTableEmpty" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x01" name="DSTStatus" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="DSTOffsetActive" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="TimeZoneStatus" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="-43200"/>
+            <to value="50400"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="1" name="Name" type="string">
+        <optionalConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="0"/>
+            <to value="64"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </event>
+    <event id="0x03" name="TimeFailure" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x04" name="MissingTrustedTimeSource" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TSC"/>
+      </mandatoryConform>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/UserLabel-Cluster.xml b/data_model/1.6/clusters/UserLabel-Cluster.xml
new file mode 100644
index 00000000000..3f108704ce2
--- /dev/null
+++ b/data_model/1.6/clusters/UserLabel-Cluster.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0041" name="User Label Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0041" name="User Label"/>
+  </clusterIds>
+  <classification hierarchy="derived" baseCluster="Label" role="utility" picsCode="ULABEL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list" default="empty">
+      <entry type="LabelStruct"/>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/ValveConfigurationControl.xml b/data_model/1.6/clusters/ValveConfigurationControl.xml
new file mode 100644
index 00000000000..dcc594bf9a4
--- /dev/null
+++ b/data_model/1.6/clusters/ValveConfigurationControl.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0081" name="Valve Configuration and Control Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0081" name="Valve Configuration and Control"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="VALCC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TS" name="TimeSync" summary="UTC time is used for time indications">
+      <describedConform/>
+    </feature>
+    <feature bit="1" code="LVL" name="Level" summary="Device supports setting the specific position of the valve">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="StatusCodeEnum">
+      <item value="0x02" name="FailureDueToFault" summary="The requested action could not be performed due to a fault on the valve.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ValveStateEnum">
+      <item value="0" name="Closed" summary="Valve is in closed position">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Open" summary="Valve is in open position">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Transitioning" summary="Valve is transitioning between closed and open positions or between levels">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="ValveFaultBitmap">
+      <bitfield name="GeneralFault" bit="0" summary="Unspecified fault detected">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Blocked" bit="1" summary="Valve is blocked">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Leaking" bit="2" summary="Valve has detected a leak">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="NotConnected" bit="3" summary="No valve is connected to controller">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ShortCircuit" bit="4" summary="Short circuit is detected">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CurrentExceeded" bit="5" summary="The available current has been exceeded">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OpenDuration" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="DefaultOpenDuration" type="elapsed-s">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="AutoCloseTime" type="epoch-us">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="TS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="RemainingDuration" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" quieterReporting="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="CurrentState" type="ValveStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="TargetState" type="ValveStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="CurrentLevel" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="LVL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="TargetLevel" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <feature name="LVL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="DefaultOpenLevel" type="percent" default="100">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="LVL"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="100"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0009" name="ValveFault" type="ValveFaultBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000A" name="LevelStep" type="uint8" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform>
+        <feature name="LVL"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to value="50"/>
+        </between>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Open" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="OpenDuration" type="elapsed-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="TargetLevel" type="percent">
+        <optionalConform>
+          <feature name="LVL"/>
+        </optionalConform>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="Close" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ValveStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ValveState" type="ValveStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ValveLevel" type="percent">
+        <mandatoryConform>
+          <feature name="LVL"/>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x01" name="ValveFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ValveFault" type="ValveFaultBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/WakeOnLAN.xml b/data_model/1.6/clusters/WakeOnLAN.xml
new file mode 100644
index 00000000000..f684f49fcec
--- /dev/null
+++ b/data_model/1.6/clusters/WakeOnLAN.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0503" name="Wake On LAN Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0503" name="Wake On LAN"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WAKEONLAN" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MACAddress" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <maxLength value="12"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="LinkLocalAddress" type="ipv6adr">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+      <constraint>
+        <allowed value="16"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/WaterContentMeasurement.xml b/data_model/1.6/clusters/WaterContentMeasurement.xml
new file mode 100644
index 00000000000..a1a1f07ca7e
--- /dev/null
+++ b/data_model/1.6/clusters/WaterContentMeasurement.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" name="Water Content Measurement Clusters" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241"/>
+    <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Removed P quality"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0405" name="Relative Humidity Measurement" picsCode="RH"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="RH" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <attribute name="MinMeasuredValue"/>
+          </from>
+          <to>
+            <attribute name="MaxMeasuredValue"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="9999"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from>
+            <compute>
+              <operation>add</operation>
+              <left>
+                <attribute name="MinMeasuredValue"/>
+              </left>
+              <right value="1"/>
+            </compute>
+          </from>
+          <to value="10000"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <max value="2048"/>
+      </constraint>
+    </attribute>
+  </attributes>
+</cluster>
diff --git a/data_model/1.6/clusters/WaterHeaterManagement.xml b/data_model/1.6/clusters/WaterHeaterManagement.xml
new file mode 100644
index 00000000000..1c1ca48ebfe
--- /dev/null
+++ b/data_model/1.6/clusters/WaterHeaterManagement.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0094" name="Water Heater Management Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added events and simplified data types"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0094" name="Water Heater Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="EWATERHTR" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="EM" name="EnergyManagement" summary="Allows energy management control of the tank">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="TP" name="TankPercent" summary="Supports monitoring the percentage of hot water in the tank">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="BoostStateEnum">
+      <item value="0" name="Inactive" summary="Boost is not currently active">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Active" summary="Boost is currently active">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="WaterHeaterHeatSourceBitmap">
+      <bitfield name="ImmersionElement1" bit="0" summary="Immersion Heating Element 1">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ImmersionElement2" bit="1" summary="Immersion Heating Element 2">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatPump" bit="2" summary="Heat pump Heating">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Boiler" bit="3" summary="Boiler Heating (e.g. Gas or Oil)">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Other" bit="4" summary="Other Heating">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="WaterHeaterBoostInfoStruct">
+      <field id="0" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="OneShot" type="bool" default="false">
+        <otherwiseConform>
+          <optionalConform>
+            <notTerm>
+              <feature name="TP"/>
+            </notTerm>
+          </optionalConform>
+          <optionalConform choice="a" max="1">
+            <feature name="TP"/>
+          </optionalConform>
+        </otherwiseConform>
+      </field>
+      <field id="2" name="EmergencyBoost" type="bool" default="false">
+        <optionalConform/>
+      </field>
+      <field id="3" name="TemporarySetpoint" type="temperature">
+        <optionalConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+      <field id="4" name="TargetPercentage" type="percent">
+        <otherwiseConform>
+          <mandatoryConform>
+            <field name="TargetReheat"/>
+          </mandatoryConform>
+          <optionalConform>
+            <feature name="TP"/>
+          </optionalConform>
+        </otherwiseConform>
+      </field>
+      <field id="5" name="TargetReheat" type="percent">
+        <optionalConform choice="a" max="1">
+          <feature name="TP"/>
+        </optionalConform>
+        <constraint>
+          <max>
+            <field name="TargetPercentage"/>
+          </max>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="HeaterTypes" type="WaterHeaterHeatSourceBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="HeatDemand" type="WaterHeaterHeatSourceBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="TankVolume" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="EstimatedHeatRequired" type="energy-mWh">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EM"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="0"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="TankPercentage" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="BoostState" type="BoostStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Boost" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="BoostInfo" type="WaterHeaterBoostInfoStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="CancelBoost" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="BoostStarted" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="BoostInfo" type="WaterHeaterBoostInfoStruct">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="BoostEnded" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/WebRTC_Provider.xml b/data_model/1.6/clusters/WebRTC_Provider.xml
new file mode 100644
index 00000000000..5d0de045bdc
--- /dev/null
+++ b/data_model/1.6/clusters/WebRTC_Provider.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0553" name="WebRTC Transport Provider Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version of the WebRTC Transport Provider Cluster"/>
+    <revision revision="2" summary="Add multi stream support"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0553" name="WebRTC Transport Provider"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WEBRTCP" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="METADATA" name="Metadata" summary="Supports metadata transmission in WebRTC sessions">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="SFrameStruct">
+      <field id="0" name="CipherSuite" type="uint16">
+        <mandatoryConform/>
+        <constraint>
+          <min value="1"/>
+        </constraint>
+      </field>
+      <field id="1" name="BaseKey" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="128"/>
+        </constraint>
+      </field>
+      <field id="2" name="KID" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <lengthBetween>
+            <from value="2"/>
+            <to value="8"/>
+          </lengthBetween>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentSessions" type="list">
+      <entry type="WebRTCSessionStruct"/>
+      <access read="true" readPrivilege="manage" fabricSensitive="true"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SolicitOffer" direction="commandToServer" response="SolicitOfferResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="StreamUsage" type="StreamUsageEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OriginatingEndpointID" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="VideoStreamID" type="VideoStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="3" name="AudioStreamID" type="AudioStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="4" name="ICEServers" type="list">
+        <entry type="ICEServerStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="5" name="ICETransportPolicy" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="6" name="MetadataEnabled" type="bool">
+        <mandatoryConform>
+          <feature name="METADATA"/>
+        </mandatoryConform>
+      </field>
+      <field id="7" name="SFrameConfig" type="SFrameStruct">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="8" name="VideoStreams" type="list">
+        <entry type="VideoStreamID"/>
+        <otherwiseConform>
+          <optionalConform choice="b" more="true" min="1">
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="9" name="AudioStreams" type="list">
+        <entry type="AudioStreamID"/>
+        <otherwiseConform>
+          <optionalConform choice="b" more="true" min="1">
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </optionalConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="SolicitOfferResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DeferredOffer" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="VideoStreamID" type="VideoStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <mandatoryConform>
+            <command name="SolicitOffer">
+              <field name="VideoStreamID"/>
+            </command>
+          </mandatoryConform>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="3" name="AudioStreamID" type="AudioStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <mandatoryConform>
+            <command name="SolicitOffer">
+              <field name="AudioStreamID"/>
+            </command>
+          </mandatoryConform>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+    </command>
+    <command id="0x02" name="ProvideOffer" direction="commandToServer" response="ProvideOfferResponse">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SDP" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StreamUsage" type="StreamUsageEnum">
+        <otherwiseConform>
+          <mandatoryConform>
+            <equalTerm>
+              <field name="WebRTCSessionID"/>
+              <literal value="null"/>
+            </equalTerm>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="3" name="OriginatingEndpointID" type="endpoint-no">
+        <otherwiseConform>
+          <mandatoryConform>
+            <equalTerm>
+              <field name="WebRTCSessionID"/>
+              <literal value="null"/>
+            </equalTerm>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="4" name="VideoStreamID" type="VideoStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="5" name="AudioStreamID" type="AudioStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <optionalConform/>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="6" name="ICEServers" type="list">
+        <entry type="ICEServerStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="7" name="ICETransportPolicy" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+      <field id="8" name="MetadataEnabled" type="bool">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="METADATA"/>
+            <equalTerm>
+              <field name="WebRTCSessionID"/>
+              <literal value="null"/>
+            </equalTerm>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+      <field id="9" name="SFrameConfig" type="SFrameStruct">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="10" name="VideoStreams" type="list">
+        <entry type="VideoStreamID"/>
+        <otherwiseConform>
+          <optionalConform choice="d" more="true" min="1">
+            <andTerm>
+              <greaterOrEqualTerm>
+                <revision value="current"/>
+                <revision value="2"/>
+              </greaterOrEqualTerm>
+              <equalTerm>
+                <field name="WebRTCSessionID"/>
+                <literal value="null"/>
+              </equalTerm>
+            </andTerm>
+          </optionalConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="11" name="AudioStreams" type="list">
+        <entry type="AudioStreamID"/>
+        <otherwiseConform>
+          <optionalConform choice="d" more="true" min="1">
+            <andTerm>
+              <greaterOrEqualTerm>
+                <revision value="current"/>
+                <revision value="2"/>
+              </greaterOrEqualTerm>
+              <equalTerm>
+                <field name="WebRTCSessionID"/>
+                <literal value="null"/>
+              </equalTerm>
+            </andTerm>
+          </optionalConform>
+          <optionalConform/>
+        </otherwiseConform>
+        <constraint>
+          <countBetween>
+            <from value="1"/>
+            <to value="16"/>
+          </countBetween>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="ProvideOfferResponse" direction="responseFromServer">
+      <quality largeMessage="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="VideoStreamID" type="VideoStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <mandatoryConform>
+            <command name="ProvideOffer">
+              <field name="VideoStreamID"/>
+            </command>
+          </mandatoryConform>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+      <field id="2" name="AudioStreamID" type="AudioStreamID">
+        <quality nullable="true"/>
+        <otherwiseConform>
+          <mandatoryConform>
+            <command name="ProvideOffer">
+              <field name="AudioStreamID"/>
+            </command>
+          </mandatoryConform>
+          <deprecateConform/>
+        </otherwiseConform>
+      </field>
+    </command>
+    <command id="0x04" name="ProvideAnswer" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SDP" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="ProvideICECandidates" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ICECandidates" type="list">
+        <entry type="ICECandidateStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x06" name="EndSession" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Reason" type="WebRTCEndReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/WebRTC_Requestor.xml b/data_model/1.6/clusters/WebRTC_Requestor.xml
new file mode 100644
index 00000000000..bf1783b952a
--- /dev/null
+++ b/data_model/1.6/clusters/WebRTC_Requestor.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0554" name="WebRTC Transport Requestor Cluster" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version of the WebRTC Transport Requestor Cluster"/>
+    <revision revision="2" summary="Add multi stream support"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0554" name="WebRTC Transport Requestor"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WEBRTCR" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="CurrentSessions" type="list">
+      <entry type="WebRTCSessionStruct"/>
+      <access read="true" readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Offer" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SDP" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ICEServers" type="list">
+        <entry type="ICEServerStruct"/>
+        <optionalConform/>
+        <constraint>
+          <maxCount value="10"/>
+        </constraint>
+      </field>
+      <field id="3" name="ICETransportPolicy" type="string">
+        <optionalConform/>
+        <constraint>
+          <maxLength value="16"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x01" name="Answer" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SDP" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="ICECandidates" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ICECandidates" type="list">
+        <entry type="ICECandidateStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <minCount value="1"/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x03" name="End" direction="commandToServer" response="Y">
+      <quality largeMessage="true"/>
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="WebRTCSessionID" type="WebRTCSessionID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Reason" type="WebRTCEndReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/WiFiNetworkManagement.xml b/data_model/1.6/clusters/WiFiNetworkManagement.xml
new file mode 100644
index 00000000000..10fb5f9a89f
--- /dev/null
+++ b/data_model/1.6/clusters/WiFiNetworkManagement.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0451" name="Wi-Fi Network Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0451" name="Wi-Fi Network Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WIFINM" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="SSID" type="octstr">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <lengthBetween>
+          <from value="1"/>
+          <to value="32"/>
+        </lengthBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="PassphraseSurrogate" type="uint64">
+      <access read="true" readPrivilege="manage"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="NetworkPassphraseRequest" direction="commandToServer" response="NetworkPassphraseResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="NetworkPassphraseResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Passphrase" type="octstr">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="64"/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/WindowCovering.xml b/data_model/1.6/clusters/WindowCovering.xml
new file mode 100644
index 00000000000..c946cfad46e
--- /dev/null
+++ b/data_model/1.6/clusters/WindowCovering.xml
@@ -0,0 +1,489 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0102" name="Window Covering Cluster" revision="8">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1994 1995 1996 1997 2086 2094 2095 2096 2097"/>
+    <revision revision="2" summary="CCB 2328"/>
+    <revision revision="3" summary="CCB 2477 2555 2845 3028"/>
+    <revision revision="4" summary="All Hubs changes with FeatureMap &amp; OperationalStatus attribute"/>
+    <revision revision="5" summary="New data model format and notation. Created plus clarified PositionAware and AbsolutePosition features. General cleanup of functionality."/>
+    <revision revision="6" summary="Marked AbsolutePosition feature and associated elements provisional."/>
+    <revision revision="7" summary="Removed ABS feature and all associated elements from the cluster."/>
+    <revision revision="8" summary="Removed P quality."/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0102" name="Window Covering"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="WNCV" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LF" name="Lift" summary="Lift control and behavior for lifting/sliding window coverings">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="1" code="TL" name="Tilt" summary="Tilt control and behavior for tilting window coverings">
+      <optionalConform choice="a" more="true" min="1"/>
+    </feature>
+    <feature bit="2" code="PA_LF" name="PositionAwareLift" summary="Position aware lift control is supported.">
+      <optionalConform>
+        <feature name="LF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="PA_TL" name="PositionAwareTilt" summary="Position aware tilt control is supported.">
+      <optionalConform>
+        <feature name="TL"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EndProductTypeEnum">
+      <item value="0" name="RollerShade" summary="Simple Roller Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="RomanShade" summary="Roman Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BalloonShade" summary="Balloon Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WovenWood" summary="Woven Wood">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="PleatedShade" summary="Pleated Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="CellularShade" summary="Cellular Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="LayeredShade" summary="Layered Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LayeredShade2D" summary="Layered Shade 2D">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="SheerShade" summary="Sheer Shade">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="TiltOnlyInteriorBlind" summary="Tilt Only Interior Blind">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="InteriorBlind" summary="Interior Blind">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="VerticalBlindStripCurtain" summary="Vertical Blind, Strip Curtain">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="InteriorVenetianBlind" summary="Interior Venetian Blind">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="ExteriorVenetianBlind" summary="Exterior Venetian Blind">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="LateralLeftCurtain" summary="Lateral Left Curtain">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="LateralRightCurtain" summary="Lateral Right Curtain">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="CentralCurtain" summary="Central Curtain">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="RollerShutter" summary="Roller Shutter">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="ExteriorVerticalScreen" summary="Exterior Vertical Screen">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="AwningTerracePatio" summary="Awning Terrace (Patio)">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="AwningVerticalScreen" summary="Awning Vertical Screen">
+        <mandatoryConform/>
+      </item>
+      <item value="21" name="TiltOnlyPergola" summary="Tilt Only Pergola">
+        <mandatoryConform/>
+      </item>
+      <item value="22" name="SwingingShutter" summary="Swinging Shutter">
+        <mandatoryConform/>
+      </item>
+      <item value="23" name="SlidingShutter" summary="Sliding Shutter">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="Unknown" summary="Unknown">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TypeEnum">
+      <item value="0" name="RollerShade" summary="RollerShade">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="RollerShade2Motor" summary="RollerShade - 2 Motor">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="RollerShadeExterior" summary="RollerShade - Exterior">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="RollerShadeExterior2Motor" summary="RollerShade - Exterior - 2 Motor">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Drapery" summary="Drapery (curtain)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Awning" summary="Awning">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Shutter" summary="Shutter">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="TiltBlindTiltOnly" summary="Tilt Blind - Tilt Only">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="TiltBlindLiftAndTilt" summary="Tilt Blind - Lift &amp; Tilt">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="ProjectorScreen" summary="Projector Screen">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="Unknown" summary="Unknown">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="ConfigStatusBitmap">
+      <bitfield name="Operational" bit="0" summary="Device is operational.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OnlineReserved" bit="1" summary="">
+        <deprecateConform/>
+      </bitfield>
+      <bitfield name="LiftMovementReversed" bit="2" summary="The lift movement is reversed.">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="LiftPositionAware" bit="3" summary="Supports the PositionAwareLift feature (PA_LF).">
+        <mandatoryConform>
+          <feature name="PA_LF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="TiltPositionAware" bit="4" summary="Supports the PositionAwareTilt feature (PA_TL).">
+        <mandatoryConform>
+          <feature name="PA_TL"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="LiftEncoderControlled" bit="5" summary="Uses an encoder for lift.">
+        <mandatoryConform>
+          <feature name="PA_LF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="TiltEncoderControlled" bit="6" summary="Uses an encoder for tilt.">
+        <mandatoryConform>
+          <feature name="PA_TL"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ModeBitmap">
+      <bitfield name="MotorDirectionReversed" bit="0" summary="Reverse the lift direction.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CalibrationMode" bit="1" summary="Perform a calibration.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MaintenanceMode" bit="2" summary="Freeze all motions for maintenance.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LedFeedback" bit="3" summary="Control the LEDs feedback.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OperationalStatusBitmap">
+      <bitfield name="Global" from="0x00" to="0x01" summary="Global operational state.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Lift" from="0x02" to="0x03" summary="Lift operational state.">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Tilt" from="0x04" to="0x05" summary="Tilt operational state.">
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="SafetyStatusBitmap">
+      <bitfield name="RemoteLockout" bit="0" summary="Movement commands are ignored (locked out). e.g. not granted authorization, outside some time/date range.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="TamperDetection" bit="1" summary="Tampering detected on sensors or any other safety equipment. Ex: a device has been forcedly moved without its actuator(s).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FailedCommunication" bit="2" summary="Communication failure to sensors or other safety equipment.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PositionFailure" bit="3" summary="Device has failed to reach the desired position. e.g. with position aware device, time expired before TargetPosition is reached.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ThermalProtection" bit="4" summary="Motor(s) and/or electric circuit thermal protection activated.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ObstacleDetected" bit="5" summary="An obstacle is preventing actuator movement.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Power" bit="6" summary="Device has power related issue or limitation e.g. device is running w/ the help of a backup battery or power might not be fully available at the moment.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StopInput" bit="7" summary="Local safety sensor (not a direct obstacle) is preventing movements (e.g. Safety EU Standard EN60335).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MotorJammed" bit="8" summary="Mechanical problem related to the motor(s) detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HardwareFailure" bit="9" summary="PCB, fuse and other electrics problems.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ManualOperation" bit="10" summary="Actuator is manually operated and is preventing actuator movement (e.g. actuator is disengaged/decoupled).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Protection" bit="11" summary="Protection is activated.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Type" type="TypeEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="NumberOfActuationsLift" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="LF"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0006" name="NumberOfActuationsTilt" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <optionalConform>
+        <feature name="TL"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0007" name="ConfigStatus" type="ConfigStatusBitmap" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0008" name="CurrentPositionLiftPercentage" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0009" name="CurrentPositionTiltPercentage" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000A" name="OperationalStatus" type="OperationalStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="63"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="TargetPositionLiftPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000C" name="TargetPositionTiltPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000D" name="EndProductType" type="EndProductTypeEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000E" name="CurrentPositionLiftPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <max value="10000"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000F" name="CurrentPositionTiltPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality nullable="true" persistence="nonVolatile"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint>
+        <max value="10000"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0017" name="Mode" type="ModeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <max value="15"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x001A" name="SafetyStatus" type="SafetyStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint>
+        <desc/>
+      </constraint>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="UpOrOpen" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="DownOrClose" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="StopMotion" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="GoToLiftPercentage" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="PA_LF"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="LF"/>
+        </optionalConform>
+      </otherwiseConform>
+      <field id="0" name="LiftPercent100thsValue" type="percent100ths">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+    <command id="0x08" name="GoToTiltPercentage" direction="commandToServer" response="Y">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TL"/>
+            <feature name="PA_TL"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="TL"/>
+        </optionalConform>
+      </otherwiseConform>
+      <field id="0" name="TiltPercent100thsValue" type="percent100ths">
+        <mandatoryConform/>
+        <constraint>
+          <desc/>
+        </constraint>
+      </field>
+    </command>
+  </commands>
+</cluster>
diff --git a/data_model/1.6/clusters/ZoneManagement.xml b/data_model/1.6/clusters/ZoneManagement.xml
new file mode 100644
index 00000000000..47386ef9d69
--- /dev/null
+++ b/data_model/1.6/clusters/ZoneManagement.xml
@@ -0,0 +1,404 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0550" name="Zone Management Cluster" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version of the Zone Management cluster"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0550" name="Zone Management"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="ZONEMGMT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TWODCART" name="TwoDimensionalCartesianZone" summary="Supports Two Dimensional Cartesian Zones">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="PERZONESENS" name="PerZoneSensitivity" summary="Supports a sensitivity value per Zone">
+      <optionalConform>
+        <feature name="TWODCART"/>
+      </optionalConform>
+    </feature>
+    <feature bit="2" code="USERDEFINED" name="UserDefined" summary="Supports user defined zones">
+      <optionalConform>
+        <feature name="TWODCART"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="FOCUSZONES" name="FocusZones" summary="Supports user defined focus zones">
+      <optionalConform>
+        <feature name="USERDEFINED"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="ZoneID" type="uint16"/>
+    <enum name="ZoneEventStoppedReasonEnum">
+      <item value="0" name="ActionStopped" summary="Indicates that whatever triggered the Zone event has stopped being detected.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Timeout" summary="Indicates that the max duration for detecting triggering activity has been reached.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ZoneEventTriggeredReasonEnum">
+      <item value="0" name="Motion" summary="Zone event triggered because motion is detected">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ZoneSourceEnum">
+      <item value="0" name="Mfg" summary="Indicates a Manufacturer defined Zone.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="User" summary="Indicates a User defined Zone.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ZoneTypeEnum">
+      <item value="0" name="TwoDCARTZone" summary="Indicates a Two Dimensional Cartesian Zone">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ZoneUseEnum">
+      <item value="0" name="Motion" summary="Indicates Zone is intended to detect Motion">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Privacy" summary="Indicates Zone is intended to protect privacy">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Focus" summary="Indicates Zone provides a focus area">
+        <mandatoryConform>
+          <feature name="FOCUSZONES"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="TwoDCartesianVertexStruct">
+      <field id="0" name="X" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Y" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TwoDCartesianZoneStruct">
+      <field id="0" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint>
+          <maxLength value="32"/>
+        </constraint>
+      </field>
+      <field id="1" name="Use" type="ZoneUseEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Vertices" type="list">
+        <entry type="TwoDCartesianVertexStruct"/>
+        <mandatoryConform/>
+        <constraint>
+          <countBetween>
+            <from value="3"/>
+            <to value="12"/>
+          </countBetween>
+        </constraint>
+      </field>
+      <field id="3" name="Color" type="string">
+        <optionalConform/>
+        <constraint>
+          <allowed value="7"/>
+        </constraint>
+        <constraint>
+          <allowed value="9"/>
+        </constraint>
+      </field>
+    </struct>
+    <struct name="ZoneInformationStruct">
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ZoneType" type="ZoneTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ZoneSource" type="ZoneSourceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TwoDCartesianZone" type="TwoDCartesianZoneStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TWODCART"/>
+            <equalTerm>
+              <field name="ZoneType"/>
+              <enum name="ZoneTypeEnum" value="TwoDCARTZone"/>
+            </equalTerm>
+          </andTerm>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="ZoneTriggerControlStruct">
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InitialDuration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to value="65535"/>
+          </between>
+        </constraint>
+      </field>
+      <field id="2" name="AugmentationDuration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <max>
+            <field name="InitialDuration"/>
+          </max>
+        </constraint>
+      </field>
+      <field id="3" name="MaxDuration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint>
+          <min>
+            <field name="InitialDuration"/>
+          </min>
+        </constraint>
+      </field>
+      <field id="4" name="BlindDuration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Sensitivity" type="uint8">
+        <mandatoryConform>
+          <feature name="PERZONESENS"/>
+        </mandatoryConform>
+        <constraint>
+          <between>
+            <from value="1"/>
+            <to>
+              <attribute name="SensitivityMax"/>
+            </to>
+          </between>
+        </constraint>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxUserDefinedZones" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="USERDEFINED"/>
+      </mandatoryConform>
+      <constraint>
+        <min value="5"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0001" name="MaxZones" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x0002" name="Zones" type="list">
+      <entry type="ZoneInformationStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="0"/>
+          <to>
+            <attribute name="MaxZones"/>
+          </to>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0003" name="Triggers" type="list">
+      <entry type="ZoneTriggerControlStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform/>
+      <constraint>
+        <countBetween>
+          <from value="0"/>
+          <to>
+            <attribute name="MaxZones"/>
+          </to>
+        </countBetween>
+      </constraint>
+    </attribute>
+    <attribute id="0x0004" name="SensitivityMax" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="2"/>
+          <to value="10"/>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0005" name="Sensitivity" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality persistence="nonVolatile"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="PERZONESENS"/>
+        </notTerm>
+      </mandatoryConform>
+      <constraint>
+        <between>
+          <from value="1"/>
+          <to>
+            <attribute name="SensitivityMax"/>
+          </to>
+        </between>
+      </constraint>
+    </attribute>
+    <attribute id="0x0006" name="TwoDCartesianMax" type="TwoDCartesianVertexStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality persistence="fixed"/>
+      <mandatoryConform>
+        <feature name="TWODCART"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="CreateTwoDCartesianZone" direction="commandToServer" response="CreateTwoDCartesianZoneResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TWODCART"/>
+          <feature name="USERDEFINED"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="Zone" type="TwoDCartesianZoneStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="CreateTwoDCartesianZoneResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TWODCART"/>
+          <feature name="USERDEFINED"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="UpdateTwoDCartesianZone" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TWODCART"/>
+          <feature name="USERDEFINED"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Zone" type="TwoDCartesianZoneStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveZone" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="USERDEFINED"/>
+      </mandatoryConform>
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="CreateOrUpdateTrigger" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="Trigger" type="ZoneTriggerControlStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="RemoveTrigger" direction="commandToServer" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="ZoneID" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ZoneTriggered" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="Zone" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Reason" type="ZoneEventTriggeredReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ZoneStopped" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="Zone" type="ZoneID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Reason" type="ZoneEventStoppedReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
diff --git a/data_model/1.6/clusters/cluster_ids.json b/data_model/1.6/clusters/cluster_ids.json
new file mode 100644
index 00000000000..a168357fd51
--- /dev/null
+++ b/data_model/1.6/clusters/cluster_ids.json
@@ -0,0 +1,138 @@
+{
+    "3": "Identify",
+    "4": "Groups",
+    "6": "On/Off",
+    "8": "Level Control",
+    "29": "Descriptor",
+    "30": "Binding",
+    "31": "Access Control",
+    "37": "Actions",
+    "40": "Basic Information",
+    "41": "OTA Software Update Provider",
+    "42": "OTA Software Update Requestor",
+    "43": "Localization Configuration",
+    "44": "Time Format Localization",
+    "45": "Unit Localization",
+    "46": "Power Source Configuration",
+    "47": "Power Source",
+    "48": "General Commissioning",
+    "49": "Network Commissioning",
+    "50": "Diagnostic Logs",
+    "51": "General Diagnostics",
+    "52": "Software Diagnostics",
+    "53": "Thread Network Diagnostics",
+    "54": "Wi-Fi Network Diagnostics",
+    "55": "Ethernet Network Diagnostics",
+    "56": "Time Synchronization",
+    "57": "Bridged Device Basic Information",
+    "59": "Switch",
+    "60": "Administrator Commissioning",
+    "62": "Operational Credentials",
+    "63": "Group Key Management",
+    "64": "Fixed Label",
+    "65": "User Label",
+    "69": "Boolean State",
+    "70": "ICD Management",
+    "72": "Oven Cavity Operational State",
+    "73": "Oven Mode",
+    "74": "Laundry Dryer Controls",
+    "80": "Mode Select",
+    "81": "Laundry Washer Mode",
+    "82": "Refrigerator And Temperature Controlled Cabinet Mode",
+    "83": "Laundry Washer Controls",
+    "84": "RVC Run Mode",
+    "85": "RVC Clean Mode",
+    "86": "Temperature Control",
+    "87": "Refrigerator Alarm",
+    "89": "Dishwasher Mode",
+    "91": "Air Quality",
+    "92": "Smoke CO Alarm",
+    "93": "Dishwasher Alarm",
+    "94": "Microwave Oven Mode",
+    "95": "Microwave Oven Control",
+    "96": "Operational State",
+    "97": "RVC Operational State",
+    "98": "Scenes Management",
+    "100": "Temperature Alarm",
+    "101": "Groupcast",
+    "113": "HEPA Filter Monitoring",
+    "114": "Activated Carbon Filter Monitoring",
+    "121": "Water Tank Level Monitoring",
+    "128": "Boolean State Configuration",
+    "129": "Valve Configuration and Control",
+    "144": "Electrical Power Measurement",
+    "145": "Electrical Energy Measurement",
+    "148": "Water Heater Management",
+    "149": "Commodity Price",
+    "151": "Messages",
+    "152": "Device Energy Management",
+    "153": "Energy EVSE",
+    "155": "Energy Preference",
+    "156": "Power Topology",
+    "157": "Energy EVSE Mode",
+    "158": "Water Heater Mode",
+    "159": "Device Energy Management Mode",
+    "160": "Electrical Grid Conditions",
+    "257": "Door Lock",
+    "258": "Window Covering",
+    "260": "Closure Control",
+    "261": "Closure Dimension",
+    "336": "Service Area",
+    "512": "Pump Configuration and Control",
+    "513": "Thermostat",
+    "514": "Fan Control",
+    "516": "Thermostat User Interface Configuration",
+    "768": "Color Control",
+    "1024": "Illuminance Measurement",
+    "1026": "Temperature Measurement",
+    "1027": "Pressure Measurement",
+    "1028": "Flow Measurement",
+    "1029": "Relative Humidity Measurement",
+    "1030": "Occupancy Sensing",
+    "1036": "Carbon Monoxide Concentration Measurement",
+    "1037": "Carbon Dioxide Concentration Measurement",
+    "1043": "Nitrogen Dioxide Concentration Measurement",
+    "1045": "Ozone Concentration Measurement",
+    "1066": "PM2.5 Concentration Measurement",
+    "1067": "Formaldehyde Concentration Measurement",
+    "1068": "PM1 Concentration Measurement",
+    "1069": "PM10 Concentration Measurement",
+    "1070": "Total Volatile Organic Compounds Concentration Measurement",
+    "1071": "Radon Concentration Measurement",
+    "1072": "Soil Measurement",
+    "1104": "Network Identity Management",
+    "1105": "Wi-Fi Network Management",
+    "1106": "Thread Border Router Management",
+    "1107": "Thread Network Directory",
+    "1108": "Thread Border Router Diagnostics",
+    "1283": "Wake On LAN",
+    "1284": "Channel",
+    "1285": "Target Navigator",
+    "1286": "Media Playback",
+    "1287": "Media Input",
+    "1288": "Low Power",
+    "1289": "Keypad Input",
+    "1290": "Content Launcher",
+    "1291": "Audio Output",
+    "1292": "Application Launcher",
+    "1293": "Application Basic",
+    "1294": "Account Login",
+    "1295": "Content Control",
+    "1296": "Content App Observer",
+    "1360": "Zone Management",
+    "1361": "Camera AV Stream Management",
+    "1362": "Camera AV Settings User Level Management",
+    "1363": "WebRTC Transport Provider",
+    "1364": "WebRTC Transport Requestor",
+    "1365": "Push AV Stream Transport",
+    "1366": "Chime",
+    "1792": "Commodity Tariff",
+    "1872": "Ecosystem Information",
+    "1873": "Commissioner Control",
+    "1874": "Joint Fabric Datastore",
+    "1875": "Joint Fabric Administrator",
+    "2049": "TLS Certificate Management",
+    "2050": "TLS Client Management",
+    "2822": "Meter Identification",
+    "2823": "Commodity Metering"
+}
diff --git a/data_model/1.6/device_types/Aggregator.xml b/data_model/1.6/device_types/Aggregator.xml
new file mode 100644
index 00000000000..c61f62e816e
--- /dev/null
+++ b/data_model/1.6/device_types/Aggregator.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000E" name="Aggregator" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Commissioner Control Cluster and FabricSynchronization Condition."/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="FabricSynchronization" summary="See description below."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0025" name="Actions" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0751" name="Commissioner Control" side="server">
+      <mandatoryConform>
+        <condition name="FabricSynchronization"/>
+      </mandatoryConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/AirPurifier.xml b/data_model/1.6/device_types/AirPurifier.xml
new file mode 100644
index 00000000000..9791d46d7f7
--- /dev/null
+++ b/data_model/1.6/device_types/AirPurifier.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002D" name="Air Purifier" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added On/Off cluster"/>
+    <revision revision="3" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0071" name="HEPA Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0072" name="Activated Carbon Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/AirQualitySensor.xml b/data_model/1.6/device_types/AirQualitySensor.xml
new file mode 100644
index 00000000000..61763636f40
--- /dev/null
+++ b/data_model/1.6/device_types/AirQualitySensor.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002C" name="Air Quality Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x005B" name="Air Quality" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040C" name="Carbon Monoxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040D" name="Carbon Dioxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0413" name="Nitrogen Dioxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0415" name="Ozone Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042A" name="PM2.5 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042B" name="Formaldehyde Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042C" name="PM1 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042D" name="PM10 Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042E" name="Total Volatile Organic Compounds Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x042F" name="Radon Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/AmbientContextSensor.xml b/data_model/1.6/device_types/AmbientContextSensor.xml
new file mode 100644
index 00000000000..e14a19b8f52
--- /dev/null
+++ b/data_model/1.6/device_types/AmbientContextSensor.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0150" name="Ambient Context Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0150" name="Service Area" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+    <cluster id="0x0431" name="Ambient Context Sensing" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/AudioDoorbell.xml b/data_model/1.6/device_types/AudioDoorbell.xml
new file mode 100644
index 00000000000..2069cfbd93e
--- /dev/null
+++ b/data_model/1.6/device_types/AudioDoorbell.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0141" name="Audio Doorbell" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Remove superset"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TLSCertificatesCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="PowerSourceCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithNTPCCond">
+        <optionalConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TLSClientCond">
+        <optionalConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003B" name="Switch" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0551" name="Camera AV Stream Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="ADO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="SNP">
+          <disallowConform/>
+        </feature>
+        <feature code="VDO">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0555" name="Push AV Stream Transport" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0556" name="Chime" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/BaseDeviceType.xml b/data_model/1.6/device_types/BaseDeviceType.xml
new file mode 100644
index 00000000000..931834bc2b2
--- /dev/null
+++ b/data_model/1.6/device_types/BaseDeviceType.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" name="Base Device Type" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Duplicate condition replaces Multiple condition"/>
+    <revision revision="3" summary="Removed certification program conditions"/>
+  </revisionHistory>
+  <conditions>
+    <condition name="Ethernet" summary="The node supports an Ethernet LAN interface"/>
+    <condition name="Wi-Fi" summary="The node supports a Wi-Fi interface"/>
+    <condition name="Thread" summary="The node supports a Thread interface"/>
+    <condition name="IP" summary="The node supports an IP interface"/>
+    <condition name="TCP" summary="The node supports TCP on each IP interface"/>
+    <condition name="UDP" summary="The node supports UDP on each IP interface"/>
+    <condition name="IPv4" summary="The node supports IPv4 on each IP interface"/>
+    <condition name="IPv6" summary="The node supports IPv6 on each IP interface"/>
+    <condition name="LanguageLocale" summary="The node supports localization for conveying text to the user"/>
+    <condition name="TimeLocale" summary="The node supports localization for conveying time to the user"/>
+    <condition name="UnitLocale" summary="The node supports localization for conveying units of measure to the user"/>
+    <condition name="SIT" summary="The node is a short idle time intermittently connected device"/>
+    <condition name="LIT" summary="The node is a long idle time intermittently connected device"/>
+    <condition name="Active" summary="The node is always able to communicate"/>
+    <condition name="Node" summary="the device type is classified as a Node device type (see Data Model specification)"/>
+    <condition name="App" summary="the device type is classified as an Application device type (see Data Model specification)"/>
+    <condition name="Simple" summary="the device type is classified as a Simple device type (see Data Model specification)"/>
+    <condition name="Dynamic" summary="the device type is classified as a Dynamic device type (see Data Model specification)"/>
+    <condition name="Composed" summary="the device type is composed of 2 or more device types (see System Model specification)"/>
+    <condition name="Client" summary="there exists a client application cluster on the endpoint"/>
+    <condition name="Server" summary="there exists a server application cluster on the endpoint"/>
+    <condition name="Duplicate" summary="the endpoint and at least one of its siblings have overlap in application device type(s)"/>
+    <condition name="BridgedPowerSourceInfo" summary="the endpoint represents a Bridged Device, for which information about the state of its power source is available to the Bridge"/>
+  </conditions>
+  <clusters>
+    <cluster id="0x001D" name="Descriptor" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="TAGLIST">
+          <mandatoryConform>
+            <condition name="Duplicate"/>
+          </mandatoryConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x001E" name="Binding" side="server">
+      <mandatoryConform>
+        <andTerm>
+          <condition name="Simple"/>
+          <condition name="Client"/>
+        </andTerm>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0040" name="Fixed Label" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0041" name="User Label" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/BasicVideoPlayer.xml b/data_model/1.6/device_types/BasicVideoPlayer.xml
new file mode 100644
index 00000000000..5f2872c2bb7
--- /dev/null
+++ b/data_model/1.6/device_types/BasicVideoPlayer.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0028" name="Basic Video Player" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Messages and Content Control clusters"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="PhysicalInputs" summary="The device has physical inputs for media."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0097" name="Messages" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="Wake On LAN" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="server">
+      <mandatoryConform>
+        <condition name="PhysicalInputs"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050B" name="Audio Output" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050F" name="Content Control" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/BatteryStorage.xml b/data_model/1.6/device_types/BatteryStorage.xml
new file mode 100644
index 00000000000..0bcb110f5f8
--- /dev/null
+++ b/data_model/1.6/device_types/BatteryStorage.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0018" name="Battery Storage" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added mandate of two Power Source and Electrical Sensor composed devices types"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+  <composedDeviceTypes>
+    <deviceType deviceTypeId="0x0510" deviceTypeName="Electrical Sensor">
+      <clusterRequirements>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+  </composedDeviceTypes>
+  <composedDeviceTypes>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </composedDeviceTypes>
+</deviceType>
diff --git a/data_model/1.6/device_types/BridgedNode.xml b/data_model/1.6/device_types/BridgedNode.xml
new file mode 100644
index 00000000000..c1c1770ca9e
--- /dev/null
+++ b/data_model/1.6/device_types/BridgedNode.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+    <revision revision="3" summary="Added Ecosystem Information Cluster and FabricSynchronizedNode Condition."/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <conditions>
+    <condition name="FabricSynchronizedNode" summary="See description below."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x002E" name="Power Source Configuration" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="BridgedPowerSourceInfo"/>
+        </mandatoryConform>
+        <deprecateConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x002F" name="Power Source" side="server">
+      <mandatoryConform>
+        <condition name="BridgedPowerSourceInfo"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0039" name="Bridged Device Basic Information" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003C" name="Administrator Commissioning" side="server">
+      <mandatoryConform>
+        <condition name="FabricSynchronizedNode"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0750" name="Ecosystem Information" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="FabricSynchronizedNode"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Camera.xml b/data_model/1.6/device_types/Camera.xml
new file mode 100644
index 00000000000..efed03dc6bf
--- /dev/null
+++ b/data_model/1.6/device_types/Camera.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0142" name="Camera" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TLSCertificatesCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="PowerSourceCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithNTPCCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithClientCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithTZCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TLSClientCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0550" name="Zone Management" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="TWODCART">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0551" name="Camera AV Stream Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="VDO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="ADO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="SNP">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0552" name="Camera AV Settings User Level Management" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0555" name="Push AV Stream Transport" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/CameraController.xml b/data_model/1.6/device_types/CameraController.xml
new file mode 100644
index 00000000000..85529ff5609
--- /dev/null
+++ b/data_model/1.6/device_types/CameraController.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0147" name="Camera Controller" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x002F" name="Power Source" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0550" name="Zone Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0551" name="Camera AV Stream Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0552" name="Camera AV Settings User Level Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0555" name="Push AV Stream Transport" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0801" name="TLS Certificate Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0802" name="TLS Client Management" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/CastingVideoClient.xml b/data_model/1.6/device_types/CastingVideoClient.xml
new file mode 100644
index 00000000000..e166b1df0e9
--- /dev/null
+++ b/data_model/1.6/device_types/CastingVideoClient.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0029" name="Casting Video Client" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Content App Observer, Messages and Content Control Clusters"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0097" name="Messages" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="Wake On LAN" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050A" name="Content Launcher" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050B" name="Audio Output" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050C" name="Application Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050D" name="Application Basic" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050E" name="Account Login" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050F" name="Content Control" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0510" name="Content App Observer" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/CastingVideoPlayer.xml b/data_model/1.6/device_types/CastingVideoPlayer.xml
new file mode 100644
index 00000000000..9b498538b91
--- /dev/null
+++ b/data_model/1.6/device_types/CastingVideoPlayer.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0023" name="Casting Video Player" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Messages and Content Control clusters"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="ContentAppPlatform" summary="The device includes a Content App Platform. A Content App is usually an application built by a Content Provider. A Casting Video Player with a Content App Platform is able to launch Content Apps and represent these apps as separate endpoints."/>
+    <condition name="PhysicalInputs" summary="The device has physical inputs for media."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0097" name="Messages" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="Wake On LAN" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="server">
+      <mandatoryConform>
+        <condition name="PhysicalInputs"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050A" name="Content Launcher" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050B" name="Audio Output" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050C" name="Application Launcher" side="server">
+      <mandatoryConform>
+        <condition name="ContentAppPlatform"/>
+      </mandatoryConform>
+      <features>
+        <feature code="AP">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x050E" name="Account Login" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050F" name="Content Control" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Chime.xml b/data_model/1.6/device_types/Chime.xml
new file mode 100644
index 00000000000..b78db333719
--- /dev/null
+++ b/data_model/1.6/device_types/Chime.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0146" name="Chime" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0556" name="Chime" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Closure.xml b/data_model/1.6/device_types/Closure.xml
new file mode 100644
index 00000000000..89b88a69295
--- /dev/null
+++ b/data_model/1.6/device_types/Closure.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0230" name="Closure" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0102" name="Window Covering" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0104" name="Closure Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0105" name="Closure Dimension" side="server">
+      <disallowConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ClosureController.xml b/data_model/1.6/device_types/ClosureController.xml
new file mode 100644
index 00000000000..5524b184079
--- /dev/null
+++ b/data_model/1.6/device_types/ClosureController.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x023E" name="Closure Controller" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0104" name="Closure Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0105" name="Closure Dimension" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ClosurePanel.xml b/data_model/1.6/device_types/ClosurePanel.xml
new file mode 100644
index 00000000000..5d621ba877e
--- /dev/null
+++ b/data_model/1.6/device_types/ClosurePanel.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0231" name="Closure Panel" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0102" name="Window Covering" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0104" name="Closure Control" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0105" name="Closure Dimension" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ColorDimmerSwitch.xml b/data_model/1.6/device_types/ColorDimmerSwitch.xml
new file mode 100644
index 00000000000..0c6007c020f
--- /dev/null
+++ b/data_model/1.6/device_types/ColorDimmerSwitch.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0105" name="Color Dimmer Switch" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification superset="Dimmer Switch" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ColorTemperatureLight.xml b/data_model/1.6/device_types/ColorTemperatureLight.xml
new file mode 100644
index 00000000000..cb3b25dc431
--- /dev/null
+++ b/data_model/1.6/device_types/ColorTemperatureLight.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010C" name="Color Temperature Light" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
+    <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="5" summary="Added Groupcast condition requirement."/>
+  </revisionHistory>
+  <classification superset="Dimmable Light" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="CT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="RemainingTime">
+          <mandatoryConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ContactSensor.xml b/data_model/1.6/device_types/ContactSensor.xml
new file mode 100644
index 00000000000..79031c69710
--- /dev/null
+++ b/data_model/1.6/device_types/ContactSensor.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0015" name="Contact Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add Boolean State Configuration as optional cluster"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ContentApp.xml b/data_model/1.6/device_types/ContentApp.xml
new file mode 100644
index 00000000000..e43081d9a85
--- /dev/null
+++ b/data_model/1.6/device_types/ContentApp.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0024" name="Content App" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Content App Observer cluster"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="ObserverClient" summary="The node is a client for ContentAppObservers."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0504" name="Channel" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050A" name="Content Launcher" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050C" name="Application Launcher" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="AP">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x050D" name="Application Basic" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050E" name="Account Login" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0510" name="Content App Observer" side="client">
+      <mandatoryConform>
+        <condition name="ObserverClient"/>
+      </mandatoryConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ControlBridge.xml b/data_model/1.6/device_types/ControlBridge.xml
new file mode 100644
index 00000000000..3ec086c085d
--- /dev/null
+++ b/data_model/1.6/device_types/ControlBridge.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0840" name="Control Bridge" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0400" name="Illuminance Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/CookSurface.xml b/data_model/1.6/device_types/CookSurface.xml
new file mode 100644
index 00000000000..1027efbb9ec
--- /dev/null
+++ b/data_model/1.6/device_types/CookSurface.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0077" name="Cook Surface" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Made TemperatureLevel (TL) the only valid temperature control mode"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="OFFONLY">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+      <features>
+        <feature code="TL">
+          <mandatoryConform/>
+        </feature>
+        <feature code="TN">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Cooktop.xml b/data_model/1.6/device_types/Cooktop.xml
new file mode 100644
index 00000000000..09f014328d6
--- /dev/null
+++ b/data_model/1.6/device_types/Cooktop.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0078" name="Cooktop" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="OFFONLY">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DeviceEnergyManagement.xml b/data_model/1.6/device_types/DeviceEnergyManagement.xml
new file mode 100644
index 00000000000..e4a3ee475cc
--- /dev/null
+++ b/data_model/1.6/device_types/DeviceEnergyManagement.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050D" name="Device Energy Management" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Updated description of when DEM Mode is to be included"/>
+    <revision revision="3" summary="Updated to include Electrical Grid Conditions"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <conditions>
+    <condition name="ControllableESA" summary="The DEM cluster on this endpoint accepts commands to adjust its energy operation."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0098" name="Device Energy Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="PA">
+          <optionalConform choice="a" more="true" min="1">
+            <condition name="ControllableESA"/>
+          </optionalConform>
+        </feature>
+        <feature code="STA">
+          <optionalConform choice="a" more="true" min="1">
+            <condition name="ControllableESA"/>
+          </optionalConform>
+        </feature>
+        <feature code="PAU">
+          <optionalConform choice="a" more="true" min="1">
+            <condition name="ControllableESA"/>
+          </optionalConform>
+        </feature>
+        <feature code="FA">
+          <optionalConform choice="a" more="true" min="1">
+            <condition name="ControllableESA"/>
+          </optionalConform>
+        </feature>
+        <feature code="CON">
+          <optionalConform choice="a" more="true" min="1">
+            <condition name="ControllableESA"/>
+          </optionalConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x009F" name="Device Energy Management Mode" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="ControllableESA"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x00A0" name="Electrical Grid Conditions" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DimmableLight.xml b/data_model/1.6/device_types/DimmableLight.xml
new file mode 100644
index 00000000000..342be43ee3e
--- /dev/null
+++ b/data_model/1.6/device_types/DimmableLight.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0101" name="Dimmable Light" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement."/>
+  </revisionHistory>
+  <classification superset="On/Off Light" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DimmablePlug-InUnit.xml b/data_model/1.6/device_types/DimmablePlug-InUnit.xml
new file mode 100644
index 00000000000..5b239731c06
--- /dev/null
+++ b/data_model/1.6/device_types/DimmablePlug-InUnit.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010B" name="Dimmable Plug-In Unit" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
+    <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="5" summary="Add Mounted Dimmable Load Control as superset, add usage guidance for both device types"/>
+    <revision revision="6" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DimmerSwitch.xml b/data_model/1.6/device_types/DimmerSwitch.xml
new file mode 100644
index 00000000000..b2b86798fa9
--- /dev/null
+++ b/data_model/1.6/device_types/DimmerSwitch.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0104" name="Dimmer Switch" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification superset="On/Off Light Switch" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Dishwasher.xml b/data_model/1.6/device_types/Dishwasher.xml
new file mode 100644
index 00000000000..d45194910ba
--- /dev/null
+++ b/data_model/1.6/device_types/Dishwasher.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0075" name="Dishwasher" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Mandate OperationCompletion Event"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0059" name="Dishwasher Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x005D" name="Dishwasher Alarm" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DoorLock.xml b/data_model/1.6/device_types/DoorLock.xml
new file mode 100644
index 00000000000..de978b4c0c6
--- /dev/null
+++ b/data_model/1.6/device_types/DoorLock.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000A" name="Door Lock" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="Initial Matter revision"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062; as noted below, this cluster remains disallowed in this device type"/>
+    <revision revision="4" summary="Removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="ACLExtensionCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncCond">
+        <optionalConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithClientCond">
+        <optionalConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0101" name="Door Lock" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/DoorLockController.xml b/data_model/1.6/device_types/DoorLockController.xml
new file mode 100644
index 00000000000..7a192576d6c
--- /dev/null
+++ b/data_model/1.6/device_types/DoorLockController.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000B" name="Door Lock Controller" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="Initial Matter revision"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062 and remove Zigbee related elements"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TimeSyncCond">
+        <optionalConform/>
+      </conditionRequirement>
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0101" name="Door Lock" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Doorbell.xml b/data_model/1.6/device_types/Doorbell.xml
new file mode 100644
index 00000000000..f5907a52a10
--- /dev/null
+++ b/data_model/1.6/device_types/Doorbell.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0148" name="Doorbell" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Remove superset"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003B" name="Switch" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="MS">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0556" name="Chime" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/EVSE.xml b/data_model/1.6/device_types/EVSE.xml
new file mode 100644
index 00000000000..4d440608f76
--- /dev/null
+++ b/data_model/1.6/device_types/EVSE.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050C" name="Energy EVSE" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Addition of associated Device Energy Management device"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0099" name="Energy EVSE" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x009D" name="Energy EVSE Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+  <composedDeviceTypes>
+    <deviceType deviceTypeId="0x0510" deviceTypeName="Electrical Sensor">
+      <clusterRequirements>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+  </composedDeviceTypes>
+  <composedDeviceTypes>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0099" name="Energy EVSE" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x009D" name="Energy EVSE Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </composedDeviceTypes>
+</deviceType>
diff --git a/data_model/1.6/device_types/ElectricalEnergyTariff.xml b/data_model/1.6/device_types/ElectricalEnergyTariff.xml
new file mode 100644
index 00000000000..6ec2a784c36
--- /dev/null
+++ b/data_model/1.6/device_types/ElectricalEnergyTariff.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0513" name="Electrical Energy Tariff" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="ActiveTariff" summary="The tariff represents the currently active tariff"/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0095" name="Commodity Price" side="server">
+      <optionalConform choice="a" more="true" min="1">
+        <condition name="ActiveTariff"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x00A0" name="Electrical Grid Conditions" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0700" name="Commodity Tariff" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ElectricalMeter.xml b/data_model/1.6/device_types/ElectricalMeter.xml
new file mode 100644
index 00000000000..ee31dc4c9f8
--- /dev/null
+++ b/data_model/1.6/device_types/ElectricalMeter.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0514" name="Electrical Meter" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification superset="Electrical Energy Tariff" class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0B07" name="Commodity Metering" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ElectricalSensor.xml b/data_model/1.6/device_types/ElectricalSensor.xml
new file mode 100644
index 00000000000..d4a1f892e1a
--- /dev/null
+++ b/data_model/1.6/device_types/ElectricalSensor.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0510" name="Electrical Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform choice="a" more="true" min="1"/>
+    </cluster>
+    <cluster id="0x009C" name="Power Topology" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ElectricalUtilityMeter.xml b/data_model/1.6/device_types/ElectricalUtilityMeter.xml
new file mode 100644
index 00000000000..5693b741880
--- /dev/null
+++ b/data_model/1.6/device_types/ElectricalUtilityMeter.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0511" name="Electrical Utility Meter" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification superset="Meter Reference Point" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TimeSyncCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0B06" name="Meter Identification" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ExtendedColorLight.xml b/data_model/1.6/device_types/ExtendedColorLight.xml
new file mode 100644
index 00000000000..415f4902e44
--- /dev/null
+++ b/data_model/1.6/device_types/ExtendedColorLight.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010D" name="Extended Color Light" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation; integrate DM CCB 3501"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
+    <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="5" summary="Added Groupcast condition requirement."/>
+  </revisionHistory>
+  <classification superset="Color Temperature Light" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="HS">
+          <optionalConform/>
+        </feature>
+        <feature code="EHUE">
+          <optionalConform/>
+        </feature>
+        <feature code="CL">
+          <optionalConform/>
+        </feature>
+        <feature code="XY">
+          <mandatoryConform/>
+        </feature>
+        <feature code="CT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="RemainingTime">
+          <mandatoryConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ExtractorHood.xml b/data_model/1.6/device_types/ExtractorHood.xml
new file mode 100644
index 00000000000..c55bc9abd16
--- /dev/null
+++ b/data_model/1.6/device_types/ExtractorHood.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007A" name="Extractor Hood" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0071" name="HEPA Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0072" name="Activated Carbon Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="RCK">
+          <disallowConform/>
+        </feature>
+        <feature code="WND">
+          <disallowConform/>
+        </feature>
+        <feature code="DIR">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Fan.xml b/data_model/1.6/device_types/Fan.xml
new file mode 100644
index 00000000000..d8c832b0f43
--- /dev/null
+++ b/data_model/1.6/device_types/Fan.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002B" name="Fan" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added ability to be composed with a Thermostat for fan heaters"/>
+    <revision revision="3" summary="Added On/Off cluster"/>
+    <revision revision="4" summary="Moved FanModeSequence element requirement to Fan Control cluster"/>
+    <revision revision="5" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/FloodlightCamera.xml b/data_model/1.6/device_types/FloodlightCamera.xml
new file mode 100644
index 00000000000..feb4927739d
--- /dev/null
+++ b/data_model/1.6/device_types/FloodlightCamera.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0144" name="Floodlight Camera" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+</deviceType>
diff --git a/data_model/1.6/device_types/FlowSensor.xml b/data_model/1.6/device_types/FlowSensor.xml
new file mode 100644
index 00000000000..e27c8ab5830
--- /dev/null
+++ b/data_model/1.6/device_types/FlowSensor.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0306" name="Flow Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/GenericSwitch.xml b/data_model/1.6/device_types/GenericSwitch.xml
new file mode 100644
index 00000000000..cf6ce4f3452
--- /dev/null
+++ b/data_model/1.6/device_types/GenericSwitch.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000F" name="Generic Switch" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Removed requirement for Fixed Label cluster (instead use TagList which was added in Descriptor cluster)"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062; note that this cluster is not used in this device type (only mentioned in the informative section related to On/Off Light Switch)"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003B" name="Switch" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/HeatPump.xml b/data_model/1.6/device_types/HeatPump.xml
new file mode 100644
index 00000000000..778d66f2e4a
--- /dev/null
+++ b/data_model/1.6/device_types/HeatPump.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0309" name="Heat Pump" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+  <composedDeviceTypes>
+    <deviceType deviceTypeId="0x0510" deviceTypeName="Electrical Sensor">
+      <clusterRequirements>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+    <deviceType deviceTypeId="0x0301" deviceTypeName="Thermostat">
+      <clusterRequirements>
+        <cluster id="0x0041" name="User Label">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+  </composedDeviceTypes>
+  <composedDeviceTypes>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="client">
+      <optionalConform/>
+    </cluster>
+  </composedDeviceTypes>
+</deviceType>
diff --git a/data_model/1.6/device_types/HumiditySensor.xml b/data_model/1.6/device_types/HumiditySensor.xml
new file mode 100644
index 00000000000..f05948b9e55
--- /dev/null
+++ b/data_model/1.6/device_types/HumiditySensor.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0307" name="Humidity Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Intercom.xml b/data_model/1.6/device_types/Intercom.xml
new file mode 100644
index 00000000000..85411d329d8
--- /dev/null
+++ b/data_model/1.6/device_types/Intercom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0140" name="Intercom" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Addition of Generic Switch"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TLSCertificatesCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="PowerSourceCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithNTPCCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithClientCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithTZCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0551" name="Camera AV Stream Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="ADO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="VDO">
+          <optionalConform/>
+        </feature>
+        <feature code="SNP">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0552" name="Camera AV Settings User Level Management" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0553" name="WebRTC Transport Provider" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0554" name="WebRTC Transport Requestor" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0556" name="Chime" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/IrrigationSystem.xml b/data_model/1.6/device_types/IrrigationSystem.xml
new file mode 100644
index 00000000000..f7de739e013
--- /dev/null
+++ b/data_model/1.6/device_types/IrrigationSystem.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0040" name="Irrigation System" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/JointFabricAdmin.xml b/data_model/1.6/device_types/JointFabricAdmin.xml
new file mode 100644
index 00000000000..a6aa0a5f7c9
--- /dev/null
+++ b/data_model/1.6/device_types/JointFabricAdmin.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0130" name="Joint Fabric Administrator" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0752" name="Joint Fabric Datastore" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0753" name="Joint Fabric Administrator" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/LaundryDryer.xml b/data_model/1.6/device_types/LaundryDryer.xml
new file mode 100644
index 00000000000..74cce08a250
--- /dev/null
+++ b/data_model/1.6/device_types/LaundryDryer.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007C" name="Laundry Dryer" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Mandate OperationCompletion Event"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x004A" name="Laundry Dryer Controls" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0051" name="Laundry Washer Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/LaundryWasher.xml b/data_model/1.6/device_types/LaundryWasher.xml
new file mode 100644
index 00000000000..1aaff12b044
--- /dev/null
+++ b/data_model/1.6/device_types/LaundryWasher.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0073" name="Laundry Washer" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Mandate OperationCompletion Event"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0051" name="Laundry Washer Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0053" name="Laundry Washer Controls" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/LightSensor.xml b/data_model/1.6/device_types/LightSensor.xml
new file mode 100644
index 00000000000..41580de4400
--- /dev/null
+++ b/data_model/1.6/device_types/LightSensor.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0106" name="Light Sensor" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Restricting Groups client to Zigbee."/>
+    <revision revision="4" summary="Removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0400" name="Illuminance Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/MeterReferencePoint.xml b/data_model/1.6/device_types/MeterReferencePoint.xml
new file mode 100644
index 00000000000..6cce132b79f
--- /dev/null
+++ b/data_model/1.6/device_types/MeterReferencePoint.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0512" name="Meter Reference Point" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="ElectricalEnergy" summary="See description below."/>
+  </conditions>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="TimeSyncCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/MicrowaveOven.xml b/data_model/1.6/device_types/MicrowaveOven.xml
new file mode 100644
index 00000000000..1ce8b1e0ac9
--- /dev/null
+++ b/data_model/1.6/device_types/MicrowaveOven.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0079" name="Microwave Oven" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Mandate OperationCompletion Event"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x005E" name="Microwave Oven Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x005F" name="Microwave Oven Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0060" name="Operational State" side="server">
+      <mandatoryConform/>
+      <attributes>
+        <attribute code="0x0002" name="CountdownTime">
+          <mandatoryConform/>
+        </attribute>
+      </attributes>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="WND">
+          <disallowConform/>
+        </feature>
+        <feature code="DIR">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ModeSelectDeviceType.xml b/data_model/1.6/device_types/ModeSelectDeviceType.xml
new file mode 100644
index 00000000000..e14b840ea9e
--- /dev/null
+++ b/data_model/1.6/device_types/ModeSelectDeviceType.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0027" name="Mode Select" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0050" name="Mode Select" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/MountedDimmableLoadControl.xml b/data_model/1.6/device_types/MountedDimmableLoadControl.xml
new file mode 100644
index 00000000000..583b7fd2e99
--- /dev/null
+++ b/data_model/1.6/device_types/MountedDimmableLoadControl.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0110" name="Mounted Dimmable Load Control" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Add superset classification and usage guidance for both device types"/>
+    <revision revision="3" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification superset="Dimmable Plug-In Unit" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/MountedOnOffControl.xml b/data_model/1.6/device_types/MountedOnOffControl.xml
new file mode 100644
index 00000000000..870c7d94cd4
--- /dev/null
+++ b/data_model/1.6/device_types/MountedOnOffControl.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010F" name="Mounted On/Off Control" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Add superset classification and usage guidance for both device types"/>
+    <revision revision="3" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification superset="On/Off Plug-in Unit" class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/NetworkInfraManager.xml b/data_model/1.6/device_types/NetworkInfraManager.xml
new file mode 100644
index 00000000000..6309cf7ee5e
--- /dev/null
+++ b/data_model/1.6/device_types/NetworkInfraManager.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0090" name="Network Infrastructure Manager" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+    <revision revision="2" summary="Added Thread Network Diagnostics requirement; extended &quot;Other Requirements&quot; section"/>
+    <revision revision="3" summary=""/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType name="Base Device Type">
+      <conditionRequirement name="IP">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="IPv4">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="IPv6">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="Ethernet">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="Wi-Fi">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="Thread">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="ManagedAclAllowed">
+        <optionalConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0450" name="Network Identity Management" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0451" name="Wi-Fi Network Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0452" name="Thread Border Router Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0453" name="Thread Network Directory" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0454" name="Thread Border Router Diagnostics" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OccupancySensor.xml b/data_model/1.6/device_types/OccupancySensor.xml
new file mode 100644
index 00000000000..8a7286963c9
--- /dev/null
+++ b/data_model/1.6/device_types/OccupancySensor.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0107" name="Occupancy Sensor" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Restricting Groups client to Zigbee"/>
+    <revision revision="4" summary="Add Boolean State Configuration as optional cluster and remove Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OnOffLight.xml b/data_model/1.6/device_types/OnOffLight.xml
new file mode 100644
index 00000000000..e418e937727
--- /dev/null
+++ b/data_model/1.6/device_types/OnOffLight.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0100" name="On/Off Light" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OnOffLightSwitch.xml b/data_model/1.6/device_types/OnOffLightSwitch.xml
new file mode 100644
index 00000000000..3e62900be2a
--- /dev/null
+++ b/data_model/1.6/device_types/OnOffLightSwitch.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0103" name="On/Off Light Switch" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OnOffPlug-inUnit.xml b/data_model/1.6/device_types/OnOffPlug-inUnit.xml
new file mode 100644
index 00000000000..b2c7d011f40
--- /dev/null
+++ b/data_model/1.6/device_types/OnOffPlug-inUnit.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010A" name="On/Off Plug-in Unit" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Add Mounted On/Off Control as superset, add usage guidance for both device types"/>
+    <revision revision="5" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="OO">
+          <mandatoryConform/>
+        </feature>
+        <feature code="LT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0000" name="CurrentLevel">
+          <constraint>
+            <between>
+              <from value="1"/>
+              <to value="254"/>
+            </between>
+          </constraint>
+        </attribute>
+        <attribute code="0x0002" name="MinLevel">
+          <constraint>
+            <allowed value="1"/>
+          </constraint>
+        </attribute>
+        <attribute code="0x0003" name="MaxLevel">
+          <constraint>
+            <allowed value="254"/>
+          </constraint>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="0x0040" name="CopyScene">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OnOffSensor.xml b/data_model/1.6/device_types/OnOffSensor.xml
new file mode 100644
index 00000000000..446467f07f9
--- /dev/null
+++ b/data_model/1.6/device_types/OnOffSensor.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0850" name="On/Off Sensor" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0300" name="Color Control" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OtaProvider.xml b/data_model/1.6/device_types/OtaProvider.xml
new file mode 100644
index 00000000000..f048fd9beb1
--- /dev/null
+++ b/data_model/1.6/device_types/OtaProvider.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0014" name="OTA Provider" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="node"/>
+  <clusters>
+    <cluster id="0x0029" name="OTA Software Update Provider" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x002A" name="OTA Software Update Requestor" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/OtaRequestor.xml b/data_model/1.6/device_types/OtaRequestor.xml
new file mode 100644
index 00000000000..b882eda30fd
--- /dev/null
+++ b/data_model/1.6/device_types/OtaRequestor.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0012" name="OTA Requestor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="node"/>
+  <clusters>
+    <cluster id="0x0029" name="OTA Software Update Provider" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x002A" name="OTA Software Update Requestor" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Oven.xml b/data_model/1.6/device_types/Oven.xml
new file mode 100644
index 00000000000..193ce51d779
--- /dev/null
+++ b/data_model/1.6/device_types/Oven.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007B" name="Oven" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Heater requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0071" name="Temperature Controlled Cabinet">
+      <conditionRequirement name="Heater">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/PowerSource.xml b/data_model/1.6/device_types/PowerSource.xml
new file mode 100644
index 00000000000..38c6f268a55
--- /dev/null
+++ b/data_model/1.6/device_types/PowerSource.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0011" name="Power Source" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="node"/>
+  <clusters>
+    <cluster id="0x002F" name="Power Source" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/PressureSensor.xml b/data_model/1.6/device_types/PressureSensor.xml
new file mode 100644
index 00000000000..bacc9b3b9a1
--- /dev/null
+++ b/data_model/1.6/device_types/PressureSensor.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0305" name="Pressure Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Pump.xml b/data_model/1.6/device_types/Pump.xml
new file mode 100644
index 00000000000..70925901cfd
--- /dev/null
+++ b/data_model/1.6/device_types/Pump.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0303" name="Pump" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0200" name="Pump Configuration and Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/PumpController.xml b/data_model/1.6/device_types/PumpController.xml
new file mode 100644
index 00000000000..2faa8967180
--- /dev/null
+++ b/data_model/1.6/device_types/PumpController.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0304" name="Pump Controller" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Remove Binding client as a result of review of CCB4058"/>
+    <revision revision="5" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0200" name="Pump Configuration and Control" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0403" name="Pressure Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/RainSensor.xml b/data_model/1.6/device_types/RainSensor.xml
new file mode 100644
index 00000000000..efe98d0c069
--- /dev/null
+++ b/data_model/1.6/device_types/RainSensor.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0044" name="Rain Sensor" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added BooleanState ChangeEvent feature as mandatory"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="CHGEVENT">
+          <mandatoryConform>
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </mandatoryConform>
+        </feature>
+      </features>
+      <events>
+        <event id="0x0000" name="StateChange">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Refrigerator.xml b/data_model/1.6/device_types/Refrigerator.xml
new file mode 100644
index 00000000000..6d22572b3fc
--- /dev/null
+++ b/data_model/1.6/device_types/Refrigerator.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0070" name="Refrigerator" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Cooler requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0071" name="Temperature Controlled Cabinet">
+      <conditionRequirement name="Cooler">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0057" name="Refrigerator Alarm" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/RoboticVacuumCleaner.xml b/data_model/1.6/device_types/RoboticVacuumCleaner.xml
new file mode 100644
index 00000000000..b4561bd9ed3
--- /dev/null
+++ b/data_model/1.6/device_types/RoboticVacuumCleaner.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0074" name="Robotic Vacuum Cleaner" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Add cluster usage constraints and informative data. Remove the element requirements section, after moving all constraints to the respective cluster specifications."/>
+    <revision revision="3" summary="Add support for the Service Area cluster"/>
+    <revision revision="4" summary="Mandate OperationCompletion Event"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0054" name="RVC Run Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0055" name="RVC Clean Mode" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0061" name="RVC Operational State" side="server">
+      <mandatoryConform/>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0150" name="Service Area" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/RoomAirConditioner.xml b/data_model/1.6/device_types/RoomAirConditioner.xml
new file mode 100644
index 00000000000..8b8a1a38a26
--- /dev/null
+++ b/data_model/1.6/device_types/RoomAirConditioner.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0072" name="Room Air Conditioner" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Thermostat User Interface Configuration cluster added; Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="3" summary="Added filter monitoring clusters"/>
+    <revision revision="4" summary=""/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="DF">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0071" name="HEPA Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0072" name="Activated Carbon Filter Monitoring" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0204" name="Thermostat User Interface Configuration" side="server">
+      <optionalConform/>
+      <attributes>
+        <attribute code="0x0001" name="KeypadLockout">
+          <optionalConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/RootNodeDeviceType.xml b/data_model/1.6/device_types/RootNodeDeviceType.xml
new file mode 100644
index 00000000000..6278a752291
--- /dev/null
+++ b/data_model/1.6/device_types/RootNodeDeviceType.xml
@@ -0,0 +1,360 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0016" name="Root Node" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+    <revision revision="3" summary="Added restriction on Managed Device feature of Access Control cluster"/>
+    <revision revision="4" summary="Added conditions and cluster requirements for Time Sync, TLS, and Power Source clusters"/>
+    <revision revision="5" summary="Added conditions and cluster requirements for the Groupcast cluster"/>
+  </revisionHistory>
+  <classification class="node" scope="node"/>
+  <conditions>
+    <condition name="CustomNetworkConfig" summary="The node only supports out-of-band-configured networking (e.g. rich user interface, manufacturer-specific means, custom commissioning flows, or future IP-compliant network technology not yet directly supported by `NetworkCommissioning` cluster)."/>
+    <condition name="ManagedAclAllowed" summary="The node has at least one endpoint where some Device Type present on the endpoint has a Device Library element requirement table entry that sets this condition to true."/>
+    <condition name="TimeSyncCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use Time Synchronization support."/>
+    <condition name="TimeSyncWithClientCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use Time Synchronization support with Client cluster support, and the TimeSyncClient feature."/>
+    <condition name="TimeSyncWithNTPCCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use Time Synchronization support with the NTPClient feature."/>
+    <condition name="TimeSyncWithTZCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use Time Synchronization support with the TimeZone feature."/>
+    <condition name="TLSCertificatesCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use TLS Certificate Management. Since TLS requires basic Time Sync support, this will include that dependency."/>
+    <condition name="TLSClientCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to use TLS Client Management. Since TLS requires basic Time Sync support, this will include that dependency."/>
+    <condition name="PowerSourceCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs to have Power Source be on the Root Node."/>
+    <condition name="ACLExtensionCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs the Access Control instance to have the Extension attribute."/>
+    <condition name="GroupcastListenerCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs the Groupcast Server cluster instance with the Listener feature. This condition SHALL be supported if any endpoint implements the Groups cluster server on an endpoint."/>
+    <condition name="GroupcastSenderCond" summary="The node has at least one endpoint where some Device Type present on the endpoint needs the Groupcast Server cluster instance with the Sender feature. This condition SHALL be supported if any endpoint implements the Bindings cluster server on an endpoint."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x001F" name="Access Control" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+      <features>
+        <feature code="MNGD">
+          <optionalConform>
+            <condition name="ManagedAclAllowed"/>
+          </optionalConform>
+        </feature>
+        <feature code="AUX">
+          <mandatoryConform>
+            <condition name="GroupcastListenerCond"/>
+          </mandatoryConform>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0001" name="Extension">
+          <mandatoryConform>
+            <condition name="ACLExtensionCond"/>
+          </mandatoryConform>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0028" name="Basic Information" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x002B" name="Localization Configuration" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="LanguageLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002C" name="Time Format Localization" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="TimeLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002D" name="Unit Localization" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <condition name="UnitLocale"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x002E" name="Power Source Configuration" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <optionalConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0030" name="General Commissioning" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0031" name="Network Commissioning" side="server">
+      <mandatoryConform>
+        <notTerm>
+          <condition name="CustomNetworkConfig"/>
+        </notTerm>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0032" name="Diagnostic Logs" side="server">
+      <quality singleton="true"/>
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0033" name="General Diagnostics" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0034" name="Software Diagnostics" side="server">
+      <quality singleton="true"/>
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Thread"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0036" name="Wi-Fi Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Wi-Fi"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0037" name="Ethernet Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Ethernet"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0038" name="Time Synchronization" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="TimeSyncCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="TimeSyncWithClientCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="TimeSyncWithNTPCCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="TimeSyncWithTZCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="TLSClientCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="TLSCertificatesCond"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <features>
+        <feature code="TSC">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithClientCond"/>
+            </mandatoryConform>
+            <optionalConform choice="a" more="true" min="1">
+              <orTerm>
+                <condition name="TLSCertificatesCond"/>
+                <condition name="TLSClientCond"/>
+              </orTerm>
+            </optionalConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="NTPC">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithNTPCCond"/>
+            </mandatoryConform>
+            <optionalConform choice="a" more="true" min="1">
+              <orTerm>
+                <condition name="TLSCertificatesCond"/>
+                <condition name="TLSClientCond"/>
+              </orTerm>
+            </optionalConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="TZ">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithTZCond"/>
+            </mandatoryConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0038" name="Time Synchronization" side="client">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="TimeSyncWithClientCond"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <features>
+        <feature code="TSC">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithClientCond"/>
+            </mandatoryConform>
+            <optionalConform choice="a" more="true" min="1">
+              <orTerm>
+                <condition name="TLSCertificatesCond"/>
+                <condition name="TLSClientCond"/>
+              </orTerm>
+            </optionalConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="NTPC">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithNTPCCond"/>
+            </mandatoryConform>
+            <optionalConform choice="a" more="true" min="1">
+              <orTerm>
+                <condition name="TLSCertificatesCond"/>
+                <condition name="TLSClientCond"/>
+              </orTerm>
+            </optionalConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="TZ">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="TimeSyncWithTZCond"/>
+            </mandatoryConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x003C" name="Administrator Commissioning" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003E" name="Operational Credentials" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x003F" name="Group Key Management" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0046" name="ICD Management" side="server">
+      <quality singleton="true"/>
+      <mandatoryConform>
+        <orTerm>
+          <condition name="SIT"/>
+          <condition name="LIT"/>
+        </orTerm>
+      </mandatoryConform>
+      <features>
+        <feature code="LITS">
+          <mandatoryConform>
+            <condition name="LIT"/>
+          </mandatoryConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0065" name="Groupcast" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="GroupcastListenerCond"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <condition name="GroupcastSenderCond"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <features>
+        <feature code="LN">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="GroupcastListenerCond"/>
+            </mandatoryConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+        <feature code="SD">
+          <otherwiseConform>
+            <mandatoryConform>
+              <condition name="GroupcastSenderCond"/>
+            </mandatoryConform>
+            <optionalConform/>
+          </otherwiseConform>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0801" name="TLS Certificate Management" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="TLSCertificatesCond"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0802" name="TLS Client Management" side="server">
+      <quality singleton="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="TLSClientCond"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/SecondaryNetworkInterface.xml b/data_model/1.6/device_types/SecondaryNetworkInterface.xml
new file mode 100644
index 00000000000..febbe65c24e
--- /dev/null
+++ b/data_model/1.6/device_types/SecondaryNetworkInterface.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0019" name="Secondary Network Interface" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0031" name="Network Commissioning" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Thread"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0036" name="Wi-Fi Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Wi-Fi"/>
+      </optionalConform>
+    </cluster>
+    <cluster id="0x0037" name="Ethernet Network Diagnostics" side="server">
+      <optionalConform>
+        <condition name="Ethernet"/>
+      </optionalConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/SmokeCOAlarm.xml b/data_model/1.6/device_types/SmokeCOAlarm.xml
new file mode 100644
index 00000000000..f4dc779ff59
--- /dev/null
+++ b/data_model/1.6/device_types/SmokeCOAlarm.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0076" name="Smoke CO Alarm" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x005C" name="Smoke CO Alarm" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x040C" name="Carbon Monoxide Concentration Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/SnapshotCamera.xml b/data_model/1.6/device_types/SnapshotCamera.xml
new file mode 100644
index 00000000000..f39717fcff0
--- /dev/null
+++ b/data_model/1.6/device_types/SnapshotCamera.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0145" name="Snapshot Camera" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="PowerSourceCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+      <conditionRequirement name="TimeSyncWithTZCond">
+        <mandatoryConform/>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0550" name="Zone Management" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="TWODCART">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0551" name="Camera AV Stream Management" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="SNP">
+          <mandatoryConform/>
+        </feature>
+        <feature code="VDO">
+          <disallowConform/>
+        </feature>
+        <feature code="ADO">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0552" name="Camera AV Settings User Level Management" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/SoilSensor.xml b/data_model/1.6/device_types/SoilSensor.xml
new file mode 100644
index 00000000000..4cb22c14752
--- /dev/null
+++ b/data_model/1.6/device_types/SoilSensor.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0045" name="Soil Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0430" name="Soil Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/SolarPower.xml b/data_model/1.6/device_types/SolarPower.xml
new file mode 100644
index 00000000000..d0875d1f864
--- /dev/null
+++ b/data_model/1.6/device_types/SolarPower.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0017" name="Solar Power" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+  <composedDeviceTypes>
+    <deviceType deviceTypeId="0x0510" deviceTypeName="Electrical Sensor">
+      <clusterRequirements>
+        <cluster id="0x0041" name="User Label">
+          <describedConform/>
+        </cluster>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+  </composedDeviceTypes>
+  <composedDeviceTypes>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+  </composedDeviceTypes>
+</deviceType>
diff --git a/data_model/1.6/device_types/Speaker.xml b/data_model/1.6/device_types/Speaker.xml
new file mode 100644
index 00000000000..62889337917
--- /dev/null
+++ b/data_model/1.6/device_types/Speaker.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0022" name="Speaker" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/TemperatureControlledCabinet.xml b/data_model/1.6/device_types/TemperatureControlledCabinet.xml
new file mode 100644
index 00000000000..146d2709baf
--- /dev/null
+++ b/data_model/1.6/device_types/TemperatureControlledCabinet.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0071" name="Temperature Controlled Cabinet" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Extension to heating cabinets"/>
+    <revision revision="3" summary="Added exclusivity for conditions"/>
+    <revision revision="4" summary="Mandate OperationCompletion Event for Oven Cavity Operational State cluster"/>
+    <revision revision="5" summary="Made TemperatureNumber (TN) the only valid temperature control mode"/>
+    <revision revision="6" summary="Added Temperature Alarm cluster"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions>
+    <condition name="Cooler" summary="The device has cooling functionality."/>
+    <condition name="Heater" summary="The device has heating functionality."/>
+  </conditions>
+  <clusters>
+    <cluster id="0x0048" name="Oven Cavity Operational State" side="server">
+      <optionalConform>
+        <condition name="Heater"/>
+      </optionalConform>
+      <commands>
+        <command id="0x0000" name="Pause">
+          <disallowConform/>
+        </command>
+        <command id="0x0003" name="Resume">
+          <disallowConform/>
+        </command>
+      </commands>
+      <events>
+        <event id="0x0001" name="OperationCompletion">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0049" name="Oven Mode" side="server">
+      <optionalConform>
+        <condition name="Heater"/>
+      </optionalConform>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode" side="server">
+      <optionalConform>
+        <condition name="Cooler"/>
+      </optionalConform>
+      <features>
+        <feature code="DEPONOFF">
+          <disallowConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="0x0002" name="StartUpMode">
+          <disallowConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0056" name="Temperature Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="TN">
+          <mandatoryConform/>
+        </feature>
+        <feature code="TL">
+          <disallowConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0064" name="Temperature Alarm" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/TemperatureSensor.xml b/data_model/1.6/device_types/TemperatureSensor.xml
new file mode 100644
index 00000000000..728edf50222
--- /dev/null
+++ b/data_model/1.6/device_types/TemperatureSensor.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0302" name="Temperature Sensor" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Added Thermostat User Interface Configuration cluster and removed Zigbee related elements"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0204" name="Thermostat User Interface Configuration" side="server">
+      <optionalConform/>
+      <attributes>
+        <attribute code="0x0001" name="KeypadLockout">
+          <optionalConform/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/Thermostat.xml b/data_model/1.6/device_types/Thermostat.xml
new file mode 100644
index 00000000000..01c7a347aa6
--- /dev/null
+++ b/data_model/1.6/device_types/Thermostat.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0301" name="Thermostat" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation, added Clusters required for Matter support, restricted legacy elements to Zigbee only"/>
+    <revision revision="3" summary="Addition of Energy Preference cluster and updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Remove Time Synchronization cluster, Scenes Management and Zigbee only clusters, remove provisional marking from Energy Preference cluster"/>
+    <revision revision="5" summary="Moved disallowed element conformance to Thermostat cluster."/>
+    <revision revision="6" summary=""/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <condition name="Active"/>
+          </mandatoryConform>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform>
+        <condition name="Active"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x009B" name="Energy Preference" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0202" name="Fan Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0204" name="Thermostat User Interface Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0402" name="Temperature Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0405" name="Relative Humidity Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ThermostatController.xml b/data_model/1.6/device_types/ThermostatController.xml
new file mode 100644
index 00000000000..d2463bf8add
--- /dev/null
+++ b/data_model/1.6/device_types/ThermostatController.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x030A" name="Thermostat Controller" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Matter revision"/>
+    <revision revision="2" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/ThreadBorderRouter.xml b/data_model/1.6/device_types/ThreadBorderRouter.xml
new file mode 100644
index 00000000000..ea6086e268f
--- /dev/null
+++ b/data_model/1.6/device_types/ThreadBorderRouter.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0091" name="Thread Border Router" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Extend &quot;Other Requirements&quot; section"/>
+    <revision revision="3" summary="Added optional Thread Border Router Diagnostics cluster"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0035" name="Thread Network Diagnostics" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0452" name="Thread Border Router Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0453" name="Thread Network Directory" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0454" name="Thread Border Router Diagnostics" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/VideoDoorbell.xml b/data_model/1.6/device_types/VideoDoorbell.xml
new file mode 100644
index 00000000000..37e4693966b
--- /dev/null
+++ b/data_model/1.6/device_types/VideoDoorbell.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0143" name="Video Doorbell" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+</deviceType>
diff --git a/data_model/1.6/device_types/VideoRemoteControl.xml b/data_model/1.6/device_types/VideoRemoteControl.xml
new file mode 100644
index 00000000000..823cd861d3f
--- /dev/null
+++ b/data_model/1.6/device_types/VideoRemoteControl.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002A" name="Video Remote Control" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Content Control cluster"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0006" name="On/Off" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0503" name="Wake On LAN" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0504" name="Channel" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0505" name="Target Navigator" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0506" name="Media Playback" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0507" name="Media Input" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0508" name="Low Power" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0509" name="Keypad Input" side="client">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x050A" name="Content Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050B" name="Audio Output" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050C" name="Application Launcher" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050E" name="Account Login" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x050F" name="Content Control" side="client">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/WaterFreezeDetector.xml b/data_model/1.6/device_types/WaterFreezeDetector.xml
new file mode 100644
index 00000000000..b422f0b205e
--- /dev/null
+++ b/data_model/1.6/device_types/WaterFreezeDetector.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0041" name="Water Freeze Detector" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added BooleanState ChangeEvent feature as mandatory"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="CHGEVENT">
+          <mandatoryConform>
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </mandatoryConform>
+        </feature>
+      </features>
+      <events>
+        <event id="0x0000" name="StateChange">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/WaterHeater.xml b/data_model/1.6/device_types/WaterHeater.xml
new file mode 100644
index 00000000000..5f04901b9e3
--- /dev/null
+++ b/data_model/1.6/device_types/WaterHeater.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050F" name="Water Heater" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0094" name="Water Heater Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x009E" name="Water Heater Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="HEAT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+  </clusters>
+  <composedDeviceTypes>
+    <deviceType deviceTypeId="0x0510" deviceTypeName="Electrical Sensor">
+      <clusterRequirements>
+        <cluster id="0x0090" name="Electrical Power Measurement">
+          <mandatoryConform/>
+        </cluster>
+        <cluster id="0x0091" name="Electrical Energy Measurement">
+          <mandatoryConform/>
+        </cluster>
+      </clusterRequirements>
+    </deviceType>
+  </composedDeviceTypes>
+  <composedDeviceTypes>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0094" name="Water Heater Management" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x009E" name="Water Heater Mode" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0201" name="Thermostat" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="HEAT">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+  </composedDeviceTypes>
+</deviceType>
diff --git a/data_model/1.6/device_types/WaterLeakDetector.xml b/data_model/1.6/device_types/WaterLeakDetector.xml
new file mode 100644
index 00000000000..7a6a1dc20e1
--- /dev/null
+++ b/data_model/1.6/device_types/WaterLeakDetector.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0043" name="Water Leak Detector" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added BooleanState ChangeEvent feature as mandatory"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0045" name="Boolean State" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="CHGEVENT">
+          <mandatoryConform>
+            <greaterOrEqualTerm>
+              <revision value="current"/>
+              <revision value="2"/>
+            </greaterOrEqualTerm>
+          </mandatoryConform>
+        </feature>
+      </features>
+      <events>
+        <event id="0x0000" name="StateChange">
+          <mandatoryConform/>
+        </event>
+      </events>
+    </cluster>
+    <cluster id="0x0080" name="Boolean State Configuration" side="server">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/WaterValve.xml b/data_model/1.6/device_types/WaterValve.xml
new file mode 100644
index 00000000000..5cecee354bf
--- /dev/null
+++ b/data_model/1.6/device_types/WaterValve.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0042" name="Water Valve" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0081" name="Valve Configuration and Control" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0404" name="Flow Measurement" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/WindowCovering.xml b/data_model/1.6/device_types/WindowCovering.xml
new file mode 100644
index 00000000000..828b00aa763
--- /dev/null
+++ b/data_model/1.6/device_types/WindowCovering.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0202" name="Window Covering" revision="7">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Scenes Management cluster was removed from Cluster Requirements"/>
+    <revision revision="5" summary="Introduced conditions on Closure clusters"/>
+    <revision revision="6" summary="Removed Zigbee related elements"/>
+    <revision revision="7" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastListenerCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <condition name="Active"/>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0102" name="Window Covering" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0104" name="Closure Control" side="server">
+      <disallowConform/>
+    </cluster>
+    <cluster id="0x0105" name="Closure Dimension" side="server">
+      <disallowConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/WindowCoveringController.xml b/data_model/1.6/device_types/WindowCoveringController.xml
new file mode 100644
index 00000000000..03b06e3688f
--- /dev/null
+++ b/data_model/1.6/device_types/WindowCoveringController.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0203" name="Window Covering Controller" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="New data model format and notation"/>
+    <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Removed Zigbee related elements and Scenes Management cluster was removed from Cluster Requirements"/>
+    <revision revision="5" summary="Added Groupcast condition requirement"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditionRequirements>
+    <deviceType id="0x0016" name="Root Node">
+      <conditionRequirement name="GroupcastSenderCond">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform>
+            <condition name="Active"/>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </conditionRequirement>
+    </deviceType>
+  </conditionRequirements>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0003" name="Identify" side="client">
+      <optionalConform/>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="client">
+      <otherwiseConform>
+        <mandatoryConform>
+          <condition name="Active"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
+    <cluster id="0x0102" name="Window Covering" side="client">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
diff --git a/data_model/1.6/device_types/device_type_ids.json b/data_model/1.6/device_types/device_type_ids.json
new file mode 100644
index 00000000000..6e60e7e42a1
--- /dev/null
+++ b/data_model/1.6/device_types/device_type_ids.json
@@ -0,0 +1,94 @@
+{
+    "10": "Door Lock",
+    "11": "Door Lock Controller",
+    "14": "Aggregator",
+    "15": "Generic Switch",
+    "17": "Power Source",
+    "18": "OTA Requestor",
+    "19": "Bridged Node",
+    "20": "OTA Provider",
+    "21": "Contact Sensor",
+    "22": "Root Node",
+    "23": "Solar Power",
+    "24": "Battery Storage",
+    "25": "Secondary Network Interface",
+    "34": "Speaker",
+    "35": "Casting Video Player",
+    "36": "Content App",
+    "39": "Mode Select",
+    "40": "Basic Video Player",
+    "41": "Casting Video Client",
+    "42": "Video Remote Control",
+    "43": "Fan",
+    "44": "Air Quality Sensor",
+    "45": "Air Purifier",
+    "64": "Irrigation System",
+    "65": "Water Freeze Detector",
+    "66": "Water Valve",
+    "67": "Water Leak Detector",
+    "68": "Rain Sensor",
+    "69": "Soil Sensor",
+    "112": "Refrigerator",
+    "113": "Temperature Controlled Cabinet",
+    "114": "Room Air Conditioner",
+    "115": "Laundry Washer",
+    "116": "Robotic Vacuum Cleaner",
+    "117": "Dishwasher",
+    "118": "Smoke CO Alarm",
+    "119": "Cook Surface",
+    "120": "Cooktop",
+    "121": "Microwave Oven",
+    "122": "Extractor Hood",
+    "123": "Oven",
+    "124": "Laundry Dryer",
+    "144": "Network Infrastructure Manager",
+    "145": "Thread Border Router",
+    "256": "On/Off Light",
+    "257": "Dimmable Light",
+    "259": "On/Off Light Switch",
+    "260": "Dimmer Switch",
+    "261": "Color Dimmer Switch",
+    "262": "Light Sensor",
+    "263": "Occupancy Sensor",
+    "266": "On/Off Plug-in Unit",
+    "267": "Dimmable Plug-In Unit",
+    "268": "Color Temperature Light",
+    "269": "Extended Color Light",
+    "271": "Mounted On/Off Control",
+    "272": "Mounted Dimmable Load Control",
+    "304": "Joint Fabric Administrator",
+    "320": "Intercom",
+    "321": "Audio Doorbell",
+    "322": "Camera",
+    "323": "Video Doorbell",
+    "324": "Floodlight Camera",
+    "325": "Snapshot Camera",
+    "326": "Chime",
+    "327": "Camera Controller",
+    "328": "Doorbell",
+    "336": "Ambient Context Sensor",
+    "514": "Window Covering",
+    "515": "Window Covering Controller",
+    "560": "Closure",
+    "561": "Closure Panel",
+    "574": "Closure Controller",
+    "769": "Thermostat",
+    "770": "Temperature Sensor",
+    "771": "Pump",
+    "772": "Pump Controller",
+    "773": "Pressure Sensor",
+    "774": "Flow Sensor",
+    "775": "Humidity Sensor",
+    "777": "Heat Pump",
+    "778": "Thermostat Controller",
+    "1292": "Energy EVSE",
+    "1293": "Device Energy Management",
+    "1295": "Water Heater",
+    "1296": "Electrical Sensor",
+    "1297": "Electrical Utility Meter",
+    "1298": "Meter Reference Point",
+    "1299": "Electrical Energy Tariff",
+    "1300": "Electrical Meter",
+    "2112": "Control Bridge",
+    "2128": "On/Off Sensor"
+}
diff --git a/data_model/1.6/globals/Bitmaps.xml b/data_model/1.6/globals/Bitmaps.xml
new file mode 100644
index 00000000000..ab815523e17
--- /dev/null
+++ b/data_model/1.6/globals/Bitmaps.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<bitmaps>
+  <bitmap name="WildcardPathFlagsBitmap">
+    <bitfield name="WildcardSkipRootNode" bit="0" summary="Skip the Root Node endpoint (endpoint 0) during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipGlobalAttributes" bit="1" summary="Skip several large global attributes during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipAttributeList" bit="2" summary="Skip the AttributeList global attribute during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="DoNotUse" bit="3" summary="">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipCommandLists" bit="4" summary="Skip the AcceptedCommandList and GeneratedCommandList global attributes during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipCustomElements" bit="5" summary="Skip any manufacturer-specific clusters or attributes during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipFixedAttributes" bit="6" summary="Skip any Fixed (F) quality attributes during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipChangesOmittedAttributes" bit="7" summary="Skip any Changes Omitted ++(C)++ quality attributes during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+    <bitfield name="WildcardSkipDiagnosticsClusters" bit="8" summary="Skip all clusters with the Diagnostics (K) quality during wildcard expansion.">
+      <mandatoryConform/>
+    </bitfield>
+  </bitmap>
+</bitmaps>
diff --git a/data_model/1.6/globals/Commands.xml b/data_model/1.6/globals/Commands.xml
new file mode 100644
index 00000000000..f7a69315211
--- /dev/null
+++ b/data_model/1.6/globals/Commands.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<commands>
+  <command id="0xFD" name="AtomicResponse" direction="responseFromServer">
+    <mandatoryConform>
+      <condition name="AtomicRequest"/>
+    </mandatoryConform>
+    <field id="0" name="StatusCode" type="status">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="AttributeStatus" type="list">
+      <entry type="AtomicAttributeStatusStruct"/>
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="Timeout" type="uint16">
+      <describedConform/>
+    </field>
+  </command>
+  <command id="0xFE" name="AtomicRequest" direction="commandToServer" response="AtomicResponse">
+    <access invokePrivilege="operate"/>
+    <describedConform/>
+    <field id="0" name="RequestType" type="AtomicRequestTypeEnum">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="AttributeRequests" type="list">
+      <entry type="attribute-id"/>
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="Timeout" type="uint16">
+      <describedConform/>
+    </field>
+  </command>
+</commands>
diff --git a/data_model/1.6/globals/Enums.xml b/data_model/1.6/globals/Enums.xml
new file mode 100644
index 00000000000..75539883819
--- /dev/null
+++ b/data_model/1.6/globals/Enums.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<enums>
+  <enum name="AtomicRequestTypeEnum">
+    <item value="0" name="BeginWrite" summary="Begin an atomic write">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="CommitWrite" summary="Commit an atomic write">
+      <mandatoryConform/>
+    </item>
+    <item value="2" name="RollbackWrite" summary="Rollback an atomic write, discarding any pending changes">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="MeasurementTypeEnum">
+    <item value="0" name="Unspecified">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="Voltage" summary="Voltage in millivolts (mV)">
+      <mandatoryConform/>
+    </item>
+    <item value="2" name="ActiveCurrent" summary="Active current in milliamps (mA)">
+      <mandatoryConform/>
+    </item>
+    <item value="3" name="ReactiveCurrent" summary="Reactive current in milliamps (mA)">
+      <mandatoryConform/>
+    </item>
+    <item value="4" name="ApparentCurrent" summary="Apparent current in milliamps (mA)">
+      <mandatoryConform/>
+    </item>
+    <item value="5" name="ActivePower" summary="Active power in milliwatts (mW)">
+      <mandatoryConform/>
+    </item>
+    <item value="6" name="ReactivePower" summary="Reactive power in millivolt-amps reactive (mVAR)">
+      <mandatoryConform/>
+    </item>
+    <item value="7" name="ApparentPower" summary="Apparent power in millivolt-amps (mVA)">
+      <mandatoryConform/>
+    </item>
+    <item value="8" name="RMSVoltage" summary="Root mean squared voltage in millivolts (mV)">
+      <mandatoryConform/>
+    </item>
+    <item value="9" name="RMSCurrent" summary="Root mean squared current in milliamps (mA)">
+      <mandatoryConform/>
+    </item>
+    <item value="10" name="RMSPower" summary="Root mean squared power in milliwatts (mW)">
+      <mandatoryConform/>
+    </item>
+    <item value="11" name="Frequency" summary="AC frequency in millihertz (mHz)">
+      <mandatoryConform/>
+    </item>
+    <item value="12" name="PowerFactor" summary="Power Factor ratio in +/- 1/100ths of a percent.">
+      <mandatoryConform/>
+    </item>
+    <item value="13" name="NeutralCurrent" summary="AC neutral current in milliamps (mA)">
+      <mandatoryConform/>
+    </item>
+    <item value="14" name="ElectricalEnergy" summary="Electrical energy in milliwatt-hours (mWh)">
+      <mandatoryConform/>
+    </item>
+    <item value="15" name="ReactiveEnergy" summary="Reactive power in millivolt-amp-hours reactive (mVARh)">
+      <mandatoryConform/>
+    </item>
+    <item value="16" name="ApparentEnergy" summary="Apparent power in millivolt-amp-hours (mVAh)">
+      <mandatoryConform/>
+    </item>
+    <item value="17" name="SoilMoisture" summary="Soil moisture in percent">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="PowerThresholdSourceEnum">
+    <item value="0x00" name="Contract" summary="The power threshold comes from a signed contract">
+      <mandatoryConform/>
+    </item>
+    <item value="0x01" name="Regulator" summary="The power threshold comes from a legal regulator">
+      <mandatoryConform/>
+    </item>
+    <item value="0x02" name="Equipment" summary="The power threshold comes from a certified limits of the meter">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="SoftwareVersionCertificationStatusEnum">
+    <item value="0" name="dev-test" summary="dev-test">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="provisional" summary="provisional">
+      <mandatoryConform/>
+    </item>
+    <item value="2" name="certified" summary="certified">
+      <mandatoryConform/>
+    </item>
+    <item value="3" name="revoked" summary="revoked">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="StreamUsageEnum">
+    <item value="0" name="Internal" summary="Internal video stream.">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="Recording" summary="Stream for recording clips.">
+      <optionalConform/>
+    </item>
+    <item value="2" name="Analysis" summary="Stream for analysis and entity detection.">
+      <optionalConform/>
+    </item>
+    <item value="3" name="LiveView" summary="Stream for liveview.">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="TariffPriceTypeEnum">
+    <item value="0x00" name="Standard" summary="Standard tariff price">
+      <mandatoryConform/>
+    </item>
+    <item value="0x01" name="Critical" summary="Price during CPP events">
+      <mandatoryConform/>
+    </item>
+    <item value="0x02" name="Virtual" summary="Price during VPP events">
+      <mandatoryConform/>
+    </item>
+    <item value="0x03" name="Incentive" summary="Price incentives">
+      <mandatoryConform/>
+    </item>
+    <item value="0x04" name="IncentiveSignal" summary="Price incentive signals">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="TariffUnitEnum">
+    <item value="0" name="kWh" summary="Kilowatt Hours">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="kVAh" summary="Kilovolt-amp Hours">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="ThreeLevelAutoEnum">
+    <item value="0" name="Auto" summary="Automatic Level">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="Low" summary="Low Level">
+      <mandatoryConform/>
+    </item>
+    <item value="2" name="Medium" summary="Medium Level">
+      <mandatoryConform/>
+    </item>
+    <item value="3" name="High" summary="High Level">
+      <mandatoryConform/>
+    </item>
+  </enum>
+  <enum name="WebRTCEndReasonEnum">
+    <item value="0" name="ICEFailed" summary="No media connection could be established to the other party">
+      <mandatoryConform/>
+    </item>
+    <item value="1" name="ICETimeout" summary="The call timed out whilst waiting for ICE candidate gathering to complete">
+      <mandatoryConform/>
+    </item>
+    <item value="2" name="UserHangup" summary="The user chose to end the call">
+      <mandatoryConform/>
+    </item>
+    <item value="3" name="UserBusy" summary="The remote party is busy">
+      <mandatoryConform/>
+    </item>
+    <item value="4" name="Replaced" summary="The call was replaced by another call">
+      <mandatoryConform/>
+    </item>
+    <item value="5" name="NoUserMedia" summary="An error code when there is no local mic/camera to use. This may be because the hardware isn&apos;t plugged in, or the user has explicitly denied access">
+      <mandatoryConform/>
+    </item>
+    <item value="6" name="InviteTimeout" summary="The call timed out whilst waiting for the offer/answer step to complete">
+      <mandatoryConform/>
+    </item>
+    <item value="7" name="AnsweredElsewhere" summary="The call was answered from a different device">
+      <mandatoryConform/>
+    </item>
+    <item value="8" name="OutOfResources" summary="The was unable to continue due to not enough resources or available streams">
+      <mandatoryConform/>
+    </item>
+    <item value="9" name="MediaTimeout" summary="The call ended due to a media timeout">
+      <mandatoryConform/>
+    </item>
+    <item value="10" name="LowPower" summary="The call ended due to hitting a low power condition">
+      <mandatoryConform/>
+    </item>
+    <item value="11" name="PrivacyMode" summary="The call ended due to the camera being set into a privacy mode.">
+      <mandatoryConform/>
+    </item>
+    <item value="12" name="UnknownReason" summary="Unknown or unspecified reason">
+      <mandatoryConform/>
+    </item>
+  </enum>
+</enums>
diff --git a/data_model/1.6/globals/Structs.xml b/data_model/1.6/globals/Structs.xml
new file mode 100644
index 00000000000..8b09094aad6
--- /dev/null
+++ b/data_model/1.6/globals/Structs.xml
@@ -0,0 +1,377 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<structs>
+  <struct name="AtomicAttributeStatusStruct">
+    <field id="0" name="AttributeID" type="attribute-id">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="StatusCode" type="status">
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="CurrencyStruct">
+    <field id="0" name="Currency" type="uint16">
+      <mandatoryConform/>
+      <constraint>
+        <max value="999"/>
+      </constraint>
+    </field>
+    <field id="1" name="DecimalPoints" type="uint8">
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="ICECandidateStruct">
+    <field id="0" name="Candidate" type="string">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="SDPMid" type="string">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+      <constraint>
+        <minLength value="1"/>
+      </constraint>
+    </field>
+    <field id="2" name="SDPMLineIndex" type="uint16">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="ICEServerStruct">
+    <field id="0" name="URLs" type="list">
+      <entry type="string">
+        <constraint>
+          <maxLength value="2000"/>
+        </constraint>
+      </entry>
+      <mandatoryConform/>
+      <constraint>
+        <maxCount value="10"/>
+      </constraint>
+    </field>
+    <field id="1" name="Username" type="string">
+      <optionalConform/>
+      <constraint>
+        <maxLength value="508"/>
+      </constraint>
+    </field>
+    <field id="2" name="Credential" type="string">
+      <optionalConform/>
+      <constraint>
+        <maxLength value="512"/>
+      </constraint>
+    </field>
+    <field id="3" name="CAID" type="TLSCAID">
+      <optionalConform/>
+      <constraint>
+        <between>
+          <from value="0"/>
+          <to value="65534"/>
+        </between>
+      </constraint>
+    </field>
+  </struct>
+  <struct name="LocationDescriptorStruct">
+    <field id="0" name="LocationName" type="string">
+      <mandatoryConform/>
+      <constraint>
+        <maxLength value="128"/>
+      </constraint>
+    </field>
+    <field id="1" name="FloorNumber" type="int16">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="AreaType" type="tag">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="MeasurementAccuracyRangeStruct">
+    <field id="0" name="RangeMin" type="int64">
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </field>
+    <field id="1" name="RangeMax" type="int64">
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </field>
+    <field id="2" name="PercentMax" type="percent100ths">
+      <optionalConform choice="a" more="true" min="1"/>
+    </field>
+    <field id="3" name="PercentMin" type="percent100ths">
+      <optionalConform>
+        <field name="PercentMax"/>
+      </optionalConform>
+      <constraint>
+        <max>
+          <field name="PercentTypical"/>
+        </max>
+      </constraint>
+    </field>
+    <field id="4" name="PercentTypical" type="percent100ths">
+      <optionalConform>
+        <field name="PercentMin"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from>
+            <field name="PercentMin"/>
+          </from>
+          <to>
+            <field name="PercentMax"/>
+          </to>
+        </between>
+      </constraint>
+    </field>
+    <field id="5" name="FixedMax" type="uint64">
+      <optionalConform choice="a" more="true" min="1"/>
+      <constraint>
+        <max>
+          <compute>
+            <operation>subtract</operation>
+            <left value="4611686018427387904"/>
+            <right value="1"/>
+          </compute>
+        </max>
+      </constraint>
+    </field>
+    <field id="6" name="FixedMin" type="uint64">
+      <optionalConform>
+        <field name="FixedMax"/>
+      </optionalConform>
+      <constraint>
+        <max>
+          <field name="FixedMax"/>
+        </max>
+      </constraint>
+    </field>
+    <field id="7" name="FixedTypical" type="uint64">
+      <optionalConform>
+        <field name="FixedMin"/>
+      </optionalConform>
+      <constraint>
+        <between>
+          <from>
+            <field name="FixedMin"/>
+          </from>
+          <to>
+            <field name="FixedMax"/>
+          </to>
+        </between>
+      </constraint>
+    </field>
+  </struct>
+  <struct name="MeasurementAccuracyStruct">
+    <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="Measured" type="bool">
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="MinMeasuredValue" type="int64">
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </field>
+    <field id="3" name="MaxMeasuredValue" type="int64">
+      <mandatoryConform/>
+      <constraint>
+        <between>
+          <from value="-4611686018427387904"/>
+          <to value="4611686018427387904"/>
+        </between>
+      </constraint>
+    </field>
+    <field id="4" name="AccuracyRanges" type="list">
+      <entry type="MeasurementAccuracyRangeStruct"/>
+      <mandatoryConform/>
+      <constraint>
+        <minCount value="1"/>
+      </constraint>
+    </field>
+  </struct>
+  <struct name="PowerThresholdStruct">
+    <field id="0" name="PowerThreshold" type="power-mW">
+      <optionalConform choice="b"/>
+    </field>
+    <field id="1" name="ApparentPowerThreshold" type="power-mVA">
+      <optionalConform choice="b"/>
+    </field>
+    <field id="2" name="PowerThresholdSource" type="PowerThresholdSourceEnum">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="PriceStruct">
+    <field id="0" name="Amount" type="money">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="Currency" type="CurrencyStruct">
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="SemanticTagStruct">
+    <field id="0" name="MfgCode" type="vendor-id" default="null">
+      <quality nullable="true"/>
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="NamespaceID" type="namespace">
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="Tag" type="tag">
+      <mandatoryConform/>
+    </field>
+    <field id="3" name="Label" type="string" default="null">
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <notEqualTerm>
+            <field name="MfgCode"/>
+            <literal value="null"/>
+          </notEqualTerm>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint>
+        <maxLength value="64"/>
+      </constraint>
+    </field>
+  </struct>
+  <struct name="ViewportStruct">
+    <field id="0" name="X1" type="uint16">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="Y1" type="uint16">
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="X2" type="uint16">
+      <mandatoryConform/>
+    </field>
+    <field id="3" name="Y2" type="uint16">
+      <mandatoryConform/>
+    </field>
+  </struct>
+  <struct name="WebRTCSessionStruct">
+    <field id="0" name="ID" type="WebRTCSessionID">
+      <mandatoryConform/>
+    </field>
+    <field id="1" name="PeerNodeID" type="node-id">
+      <mandatoryConform/>
+    </field>
+    <field id="2" name="PeerEndpointID" type="endpoint-no">
+      <mandatoryConform/>
+    </field>
+    <field id="3" name="StreamUsage" type="StreamUsageEnum">
+      <mandatoryConform/>
+    </field>
+    <field id="4" name="VideoStreamID" type="VideoStreamID">
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <optionalConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+    </field>
+    <field id="5" name="AudioStreamID" type="AudioStreamID">
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <optionalConform/>
+        <deprecateConform/>
+      </otherwiseConform>
+    </field>
+    <field id="6" name="MetadataEnabled" type="bool">
+      <mandatoryConform/>
+    </field>
+    <field id="7" name="VideoStreams" type="list">
+      <entry type="VideoStreamID"/>
+      <optionalConform choice="a" more="true" min="1"/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="16"/>
+        </countBetween>
+      </constraint>
+    </field>
+    <field id="8" name="AudioStreams" type="list">
+      <entry type="AudioStreamID"/>
+      <optionalConform choice="a" more="true" min="1"/>
+      <constraint>
+        <countBetween>
+          <from value="1"/>
+          <to value="16"/>
+        </countBetween>
+      </constraint>
+    </field>
+    <access fabricScoped="true"/>
+  </struct>
+</structs>
diff --git a/data_model/1.6/globals/TypeDefs.xml b/data_model/1.6/globals/TypeDefs.xml
new file mode 100644
index 00000000000..d6c6b2a73c3
--- /dev/null
+++ b/data_model/1.6/globals/TypeDefs.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<typeDefs>
+  <number name="WebRTCSessionID" type="uint16"/>
+</typeDefs>
diff --git a/data_model/1.6/namespaces/Namespace-Closure-Cabinet.xml b/data_model/1.6/namespaces/Namespace-Closure-Cabinet.xml
new file mode 100644
index 00000000000..3f511dbceda
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Closure-Cabinet.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0048" name="Closure Cabinet">
+  <tags>
+    <tag id="0x0000" name="CabinetDoor">
+      <description>A hinged or sliding panel used to cover the opening of a cabinet, providing access to its interior.</description>
+    </tag>
+    <tag id="0x0001" name="Drawer">
+      <description>A sliding storage compartment, typically built into furniture like cabinets, desks, or dressers.</description>
+    </tag>
+    <tag id="0x0002" name="Flap">
+      <description>A hinged front or flexible cover that can be lifted or moved, providing access to its interior.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Closure-Covering.xml b/data_model/1.6/namespaces/Namespace-Closure-Covering.xml
new file mode 100644
index 00000000000..722175b9a16
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Closure-Covering.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0046" name="Closure Covering">
+  <tags>
+    <tag id="0x0000" name="Blind">
+      <description>A covering made of horizontal or vertical slats that can be adjusted to control light, privacy, and airflow.</description>
+    </tag>
+    <tag id="0x0001" name="Awning">
+      <description>A protective covering, typically made of fabric or metal, that extends from a building&apos;s exterior to provide shade or shelter from the elements.</description>
+    </tag>
+    <tag id="0x0002" name="Shutter">
+      <description>A hinged or sliding covering typically made of wood, metal, or vinyl, used to provide privacy, security, and light control.</description>
+    </tag>
+    <tag id="0x0003" name="Venetian">
+      <description>A type of covering consisting of horizontal slats that can be adjusted to control light, privacy, and airflow.</description>
+    </tag>
+    <tag id="0x0004" name="Curtain">
+      <description>A piece of fabric hung over a window to provide privacy, block light, or enhance the room’s embellishment.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Closure-Window.xml b/data_model/1.6/namespaces/Namespace-Closure-Window.xml
new file mode 100644
index 00000000000..13dfe6abff4
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Closure-Window.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0047" name="Closure Window">
+  <tags>
+    <tag id="0x0000" name="Roof">
+      <description>A window installed in a roof to provide natural light, ventilation, and sometimes access to the roof.</description>
+    </tag>
+    <tag id="0x0001" name="Facade">
+      <description>A window installed in the vertical exterior wall of a building. It allows natural light, ventilation, and views.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Closure.xml b/data_model/1.6/namespaces/Namespace-Closure.xml
new file mode 100644
index 00000000000..bb13f60596e
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Closure.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0044" name="Closure">
+  <tags>
+    <tag id="0x0000" name="Covering">
+      <description>Any material or treatment used to cover a window for privacy, light control, insulation, or decoration.</description>
+    </tag>
+    <tag id="0x0001" name="Window">
+      <description>An opening in a wall, door, or roof fitted with glass or another transparent material to allow light, air, and views while providing insulation and security.</description>
+    </tag>
+    <tag id="0x0002" name="Barrier">
+      <description>A physical or conceptual obstruction that prevents movement, access, or progress that serve purposes such as security, safety, privacy, control, etc.</description>
+    </tag>
+    <tag id="0x0003" name="Cabinet">
+      <description>A storage unit with shelves, drawers, or doors, used for organizing and protecting items.</description>
+    </tag>
+    <tag id="0x0004" name="Gate">
+      <description>A movable barrier that controls entry or exit through an opening in a fence, wall, or enclosure.</description>
+    </tag>
+    <tag id="0x0005" name="GarageDoor">
+      <description>A large, movable barrier that provides access to a garage.</description>
+    </tag>
+    <tag id="0x0006" name="Door">
+      <description>A movable barrier that allows entry and exit between spaces while providing security, privacy, and insulation.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-ClosurePanel.xml b/data_model/1.6/namespaces/Namespace-ClosurePanel.xml
new file mode 100644
index 00000000000..4367b0184c0
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-ClosurePanel.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0045" name="Closure Panel">
+  <tags>
+    <tag id="0x0000" name="Lift">
+      <description>Refers to the upward or downward motion of an object, typically along a vertical axis.</description>
+    </tag>
+    <tag id="0x0001" name="Tilt">
+      <description>Refers to the action of rotating or tilting an object or surface along a horizontal or vertical axis.</description>
+    </tag>
+    <tag id="0x0002" name="Sliding">
+      <description>Refers to the smooth, horizontal motion of an object along an axis, where the object moves back and forth or side to side.</description>
+    </tag>
+    <tag id="0x0003" name="Rotate">
+      <description>Refers to the circular motion of an object around a fixed point or axis, typically in a circular motion.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-CommodityTariff-Chronology.xml b/data_model/1.6/namespaces/Namespace-CommodityTariff-Chronology.xml
new file mode 100644
index 00000000000..df5f4c97cb8
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-CommodityTariff-Chronology.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x000B" name="Commodity Tariff Chronology">
+  <tags>
+    <tag id="0x0000" name="Current">
+      <description>Represents the current Commodity Tariff</description>
+    </tag>
+    <tag id="0x0001" name="Previous">
+      <description>Represents the previous Commodity Tariff</description>
+    </tag>
+    <tag id="0x0002" name="Upcoming">
+      <description>Represents the upcoming Commodity Tariff</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-CommodityTariff-Commodity.xml b/data_model/1.6/namespaces/Namespace-CommodityTariff-Commodity.xml
new file mode 100644
index 00000000000..851b515b7be
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-CommodityTariff-Commodity.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x000D" name="Commodity Tariff Commodity">
+  <tags>
+    <tag id="0x0000" name="ElectricalEnergy"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-CommodityTariff-Flow.xml b/data_model/1.6/namespaces/Namespace-CommodityTariff-Flow.xml
new file mode 100644
index 00000000000..6f8461e9008
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-CommodityTariff-Flow.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0013" name="Commodity Tariff Flow">
+  <tags>
+    <tag id="0x0000" name="Import"/>
+    <tag id="0x0001" name="Export"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Area.xml b/data_model/1.6/namespaces/Namespace-Common-Area.xml
new file mode 100644
index 00000000000..0f13aab8dc1
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Area.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0010" name="Common Area">
+  <tags>
+    <tag id="0x0000" name="Aisle"/>
+    <tag id="0x0001" name="Attic"/>
+    <tag id="0x0002" name="BackDoor"/>
+    <tag id="0x0003" name="BackYard"/>
+    <tag id="0x0004" name="Balcony"/>
+    <tag id="0x0005" name="Ballroom"/>
+    <tag id="0x0006" name="Bathroom">
+      <description>Also known as Restroom</description>
+    </tag>
+    <tag id="0x0007" name="Bedroom"/>
+    <tag id="0x0008" name="Border"/>
+    <tag id="0x0009" name="Boxroom">
+      <description>A small room typically used for storage</description>
+    </tag>
+    <tag id="0x000A" name="BreakfastRoom"/>
+    <tag id="0x000B" name="Carport"/>
+    <tag id="0x000C" name="Cellar"/>
+    <tag id="0x000D" name="Cloakroom"/>
+    <tag id="0x000E" name="Closet">
+      <description>A small room for storing clothing, linens, and other items.</description>
+    </tag>
+    <tag id="0x000F" name="Conservatory"/>
+    <tag id="0x0010" name="Corridor"/>
+    <tag id="0x0011" name="CraftRoom"/>
+    <tag id="0x0012" name="Cupboard"/>
+    <tag id="0x0013" name="Deck"/>
+    <tag id="0x0014" name="Den">
+      <description>A small, comfortable room for individual activities such as work or hobbies</description>
+    </tag>
+    <tag id="0x0015" name="Dining"/>
+    <tag id="0x0016" name="DrawingRoom"/>
+    <tag id="0x0017" name="DressingRoom"/>
+    <tag id="0x0018" name="Driveway"/>
+    <tag id="0x0019" name="Elevator"/>
+    <tag id="0x001A" name="Ensuite">
+      <description>A bathroom directly accessible from a bedroom</description>
+    </tag>
+    <tag id="0x001B" name="Entrance"/>
+    <tag id="0x001C" name="Entryway"/>
+    <tag id="0x001D" name="FamilyRoom"/>
+    <tag id="0x001E" name="Foyer"/>
+    <tag id="0x001F" name="FrontDoor"/>
+    <tag id="0x0020" name="FrontYard"/>
+    <tag id="0x0021" name="GameRoom"/>
+    <tag id="0x0022" name="Garage"/>
+    <tag id="0x0023" name="GarageDoor"/>
+    <tag id="0x0024" name="Garden"/>
+    <tag id="0x0025" name="GardenDoor"/>
+    <tag id="0x0026" name="GuestBathroom">
+      <description>Also known as Guest Restroom</description>
+    </tag>
+    <tag id="0x0027" name="GuestBedroom"/>
+    <tag id="0x0029" name="GuestRoom">
+      <description>Also known as Guest Bedroom</description>
+    </tag>
+    <tag id="0x002A" name="Gym"/>
+    <tag id="0x002B" name="Hallway"/>
+    <tag id="0x002C" name="HearthRoom">
+      <description>A cozy room containing a fireplace or other point heat source</description>
+    </tag>
+    <tag id="0x002D" name="KidsRoom"/>
+    <tag id="0x002E" name="KidsBedroom"/>
+    <tag id="0x002F" name="Kitchen"/>
+    <tag id="0x0031" name="LaundryRoom"/>
+    <tag id="0x0032" name="Lawn"/>
+    <tag id="0x0033" name="Library"/>
+    <tag id="0x0034" name="LivingRoom"/>
+    <tag id="0x0035" name="Lounge"/>
+    <tag id="0x0036" name="MediaTvRoom"/>
+    <tag id="0x0037" name="MudRoom">
+      <description>A space used to remove soiled garments prior to entering the domicile proper</description>
+    </tag>
+    <tag id="0x0038" name="MusicRoom"/>
+    <tag id="0x0039" name="Nursery"/>
+    <tag id="0x003A" name="Office"/>
+    <tag id="0x003B" name="OutdoorKitchen"/>
+    <tag id="0x003C" name="Outside"/>
+    <tag id="0x003D" name="Pantry">
+      <description>AKA a larder, a place where food is stored</description>
+    </tag>
+    <tag id="0x003E" name="ParkingLot"/>
+    <tag id="0x003F" name="Parlor"/>
+    <tag id="0x0040" name="Patio"/>
+    <tag id="0x0041" name="PlayRoom"/>
+    <tag id="0x0042" name="PoolRoom">
+      <description>A room centered around a pool/billiards table</description>
+    </tag>
+    <tag id="0x0043" name="Porch"/>
+    <tag id="0x0044" name="PrimaryBathroom"/>
+    <tag id="0x0045" name="PrimaryBedroom"/>
+    <tag id="0x0046" name="Ramp"/>
+    <tag id="0x0047" name="ReceptionRoom"/>
+    <tag id="0x0048" name="RecreationRoom"/>
+    <tag id="0x004A" name="Roof"/>
+    <tag id="0x004B" name="Sauna"/>
+    <tag id="0x004C" name="Scullery">
+      <description>A utility space for cleaning dishes and laundry</description>
+    </tag>
+    <tag id="0x004D" name="SewingRoom"/>
+    <tag id="0x004E" name="Shed"/>
+    <tag id="0x004F" name="SideDoor"/>
+    <tag id="0x0050" name="SideYard"/>
+    <tag id="0x0051" name="SittingRoom"/>
+    <tag id="0x0052" name="Snug">
+      <description>An informal space meant to be &apos;cozy&apos;, &apos;snug&apos;, relaxed, meant to share with family or friends</description>
+    </tag>
+    <tag id="0x0053" name="Spa"/>
+    <tag id="0x0054" name="Staircase"/>
+    <tag id="0x0055" name="SteamRoom"/>
+    <tag id="0x0056" name="StorageRoom"/>
+    <tag id="0x0057" name="Studio"/>
+    <tag id="0x0058" name="Study"/>
+    <tag id="0x0059" name="SunRoom"/>
+    <tag id="0x005A" name="SwimmingPool"/>
+    <tag id="0x005B" name="Terrace"/>
+    <tag id="0x005C" name="UtilityRoom"/>
+    <tag id="0x005D" name="Ward">
+      <description>The innermost area of a large home</description>
+    </tag>
+    <tag id="0x005E" name="Workshop"/>
+    <tag id="0x005F" name="Toilet">
+      <description>A room dedicated to a toilet; a water closet / WC</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Closure.xml b/data_model/1.6/namespaces/Namespace-Common-Closure.xml
new file mode 100644
index 00000000000..6cc806308e3
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Closure.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0001" name="Common Closure">
+  <tags>
+    <tag id="0x0000" name="Opening">
+      <description>Move toward open position</description>
+    </tag>
+    <tag id="0x0001" name="Closing">
+      <description>Move toward closed position</description>
+    </tag>
+    <tag id="0x0002" name="Stop">
+      <description>Stop any movement</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-CompassDirection.xml b/data_model/1.6/namespaces/Namespace-Common-CompassDirection.xml
new file mode 100644
index 00000000000..4139b5ecb80
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-CompassDirection.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0002" name="Common Compass Direction">
+  <tags>
+    <tag id="0x0000" name="Northward"/>
+    <tag id="0x0001" name="NorthEastward"/>
+    <tag id="0x0002" name="Eastward"/>
+    <tag id="0x0003" name="SouthEastward"/>
+    <tag id="0x0004" name="Southward"/>
+    <tag id="0x0005" name="SouthWestward"/>
+    <tag id="0x0006" name="Westward"/>
+    <tag id="0x0007" name="NorthWestward"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-CompassLocation.xml b/data_model/1.6/namespaces/Namespace-Common-CompassLocation.xml
new file mode 100644
index 00000000000..62385083080
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-CompassLocation.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0003" name="Common Compass Location">
+  <tags>
+    <tag id="0x0000" name="North"/>
+    <tag id="0x0001" name="NorthEast"/>
+    <tag id="0x0002" name="East"/>
+    <tag id="0x0003" name="SouthEast"/>
+    <tag id="0x0004" name="South"/>
+    <tag id="0x0005" name="SouthWest"/>
+    <tag id="0x0006" name="West"/>
+    <tag id="0x0007" name="NorthWest"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Direction.xml b/data_model/1.6/namespaces/Namespace-Common-Direction.xml
new file mode 100644
index 00000000000..8d888f32a1f
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Direction.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0004" name="Common Direction">
+  <tags>
+    <tag id="0x0000" name="Upward"/>
+    <tag id="0x0001" name="Downward"/>
+    <tag id="0x0002" name="Leftward"/>
+    <tag id="0x0003" name="Rightward"/>
+    <tag id="0x0004" name="Forward"/>
+    <tag id="0x0005" name="Backward"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Landmark.xml b/data_model/1.6/namespaces/Namespace-Common-Landmark.xml
new file mode 100644
index 00000000000..7d1450008c7
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Landmark.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0011" name="Common Landmark">
+  <tags>
+    <tag id="0x0000" name="AirConditioner"/>
+    <tag id="0x0001" name="AirPurifier"/>
+    <tag id="0x0002" name="BackDoor"/>
+    <tag id="0x0003" name="BarStool"/>
+    <tag id="0x0004" name="BathMat"/>
+    <tag id="0x0005" name="Bathtub"/>
+    <tag id="0x0006" name="Bed"/>
+    <tag id="0x0007" name="Bookshelf"/>
+    <tag id="0x0008" name="Chair"/>
+    <tag id="0x0009" name="ChristmasTree"/>
+    <tag id="0x000A" name="CoatRack"/>
+    <tag id="0x000B" name="CoffeeTable"/>
+    <tag id="0x000C" name="CookingRange"/>
+    <tag id="0x000D" name="Couch"/>
+    <tag id="0x000E" name="Countertop"/>
+    <tag id="0x000F" name="Cradle"/>
+    <tag id="0x0010" name="Crib"/>
+    <tag id="0x0011" name="Desk"/>
+    <tag id="0x0012" name="DiningTable"/>
+    <tag id="0x0013" name="Dishwasher"/>
+    <tag id="0x0014" name="Door"/>
+    <tag id="0x0015" name="Dresser"/>
+    <tag id="0x0016" name="LaundryDryer"/>
+    <tag id="0x0017" name="Fan"/>
+    <tag id="0x0018" name="Fireplace"/>
+    <tag id="0x0019" name="Freezer"/>
+    <tag id="0x001A" name="FrontDoor"/>
+    <tag id="0x001B" name="HighChair"/>
+    <tag id="0x001C" name="KitchenIsland"/>
+    <tag id="0x001D" name="Lamp"/>
+    <tag id="0x001E" name="LitterBox"/>
+    <tag id="0x001F" name="Mirror"/>
+    <tag id="0x0020" name="Nightstand"/>
+    <tag id="0x0021" name="Oven"/>
+    <tag id="0x0022" name="PetBed"/>
+    <tag id="0x0023" name="PetBowl"/>
+    <tag id="0x0024" name="PetCrate">
+      <description>An indoor furnishing for pets to rest or sleep inside</description>
+    </tag>
+    <tag id="0x0025" name="Refrigerator"/>
+    <tag id="0x0026" name="ScratchingPost"/>
+    <tag id="0x0027" name="ShoeRack"/>
+    <tag id="0x0028" name="Shower">
+      <description>An area where a showerhead dispenses water for people to shower</description>
+    </tag>
+    <tag id="0x0029" name="SideDoor"/>
+    <tag id="0x002A" name="Sink"/>
+    <tag id="0x002B" name="Sofa"/>
+    <tag id="0x002C" name="Stove"/>
+    <tag id="0x002D" name="Table"/>
+    <tag id="0x002E" name="Toilet"/>
+    <tag id="0x002F" name="TrashCan"/>
+    <tag id="0x0030" name="LaundryWasher"/>
+    <tag id="0x0031" name="Window"/>
+    <tag id="0x0032" name="WineCooler">
+      <description>A type of refrigerator that is shelved to hold wine bottles and (typically) display them through a glass front</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Level.xml b/data_model/1.6/namespaces/Namespace-Common-Level.xml
new file mode 100644
index 00000000000..fb709116e8a
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Level.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0005" name="Common Level">
+  <tags>
+    <tag id="0x0000" name="Low"/>
+    <tag id="0x0001" name="Medium"/>
+    <tag id="0x0002" name="High"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Location.xml b/data_model/1.6/namespaces/Namespace-Common-Location.xml
new file mode 100644
index 00000000000..453ea6e1581
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Location.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0006" name="Common Location">
+  <tags>
+    <tag id="0x0000" name="Indoor">
+      <description>Element is indoors or related to indoor equipment/conditions (e.g. the &quot;indoor&quot; temperature).</description>
+    </tag>
+    <tag id="0x0001" name="Outdoor">
+      <description>Element is outdoors or related to outdoor equipment/conditions (e.g. the &quot;outdoor&quot; temperature).</description>
+    </tag>
+    <tag id="0x0002" name="Inside">
+      <description>Element is located inside the equipment (e.g. a sensor &quot;inside&quot; a cabinet).</description>
+    </tag>
+    <tag id="0x0003" name="Outside">
+      <description>Element is located outside the equipment (e.g. a sensor &quot;outside&quot; a cabinet).</description>
+    </tag>
+    <tag id="0x0004" name="Zone">
+      <description>Element is a part of a location divided into zones (e.g. a yard irrigation zone).</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Number.xml b/data_model/1.6/namespaces/Namespace-Common-Number.xml
new file mode 100644
index 00000000000..2e54510f51d
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Number.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0007" name="Common Number">
+  <tags>
+    <tag id="0x0000" name="Zero"/>
+    <tag id="0x0001" name="One"/>
+    <tag id="0x0002" name="Two"/>
+    <tag id="0x0003" name="Three"/>
+    <tag id="0x0004" name="Four"/>
+    <tag id="0x0005" name="Five"/>
+    <tag id="0x0006" name="Six"/>
+    <tag id="0x0007" name="Seven"/>
+    <tag id="0x0008" name="Eight"/>
+    <tag id="0x0009" name="Nine"/>
+    <tag id="0x000A" name="Ten"/>
+    <tag id="0x000B" name="Eleven"/>
+    <tag id="0x000C" name="Twelve"/>
+    <tag id="0x000D" name="Thirteen"/>
+    <tag id="0x000E" name="Fourteen"/>
+    <tag id="0x000F" name="Fifteen"/>
+    <tag id="0x0010" name="Sixteen"/>
+    <tag id="0x0011" name="Seventeen"/>
+    <tag id="0x0012" name="Eighteen"/>
+    <tag id="0x0013" name="Nineteen"/>
+    <tag id="0x0014" name="Twenty"/>
+    <tag id="0x0015" name="TwentyOne"/>
+    <tag id="0x0016" name="TwentyTwo"/>
+    <tag id="0x0017" name="TwentyThree"/>
+    <tag id="0x0018" name="TwentyFour"/>
+    <tag id="0x0019" name="TwentyFive"/>
+    <tag id="0x001A" name="TwentySix"/>
+    <tag id="0x001B" name="TwentySeven"/>
+    <tag id="0x001C" name="TwentyEight"/>
+    <tag id="0x001D" name="TwentyNine"/>
+    <tag id="0x001E" name="Thirty"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-Position.xml b/data_model/1.6/namespaces/Namespace-Common-Position.xml
new file mode 100644
index 00000000000..0551a318cb8
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-Position.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0008" name="Common Position">
+  <tags>
+    <tag id="0x0000" name="Left"/>
+    <tag id="0x0001" name="Right"/>
+    <tag id="0x0002" name="Top"/>
+    <tag id="0x0003" name="Bottom"/>
+    <tag id="0x0004" name="Middle"/>
+    <tag id="0x0005" name="Row">
+      <description>Numeric value provided in Label field</description>
+    </tag>
+    <tag id="0x0006" name="Column">
+      <description>Numeric value provided in Label field</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Common-RelativePosition.xml b/data_model/1.6/namespaces/Namespace-Common-RelativePosition.xml
new file mode 100644
index 00000000000..2f86f672bdd
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Common-RelativePosition.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0012" name="Common Relative Position">
+  <tags>
+    <tag id="0x0000" name="Under"/>
+    <tag id="0x0001" name="NextTo">
+      <description>Area in proximity to the point of reference</description>
+    </tag>
+    <tag id="0x0002" name="Around">
+      <description>The area surrounding the point the reference</description>
+    </tag>
+    <tag id="0x0003" name="On"/>
+    <tag id="0x0004" name="Above"/>
+    <tag id="0x0005" name="FrontOf"/>
+    <tag id="0x0006" name="Behind"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-ElectricalMeasurement.xml b/data_model/1.6/namespaces/Namespace-ElectricalMeasurement.xml
new file mode 100644
index 00000000000..84f8a192d8b
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-ElectricalMeasurement.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x000A" name="Electrical Measurement">
+  <tags>
+    <tag id="0x0000" name="DC">
+      <description>Indicates values measured for a DC load</description>
+    </tag>
+    <tag id="0x0001" name="AC">
+      <description>Indicates values measured for a single-phase AC load, or values measured for the collective load on a polyphase AC power supply</description>
+    </tag>
+    <tag id="0x0002" name="ACPhase1">
+      <description>Indicates values measured for an AC load on phase 1 of a polyphase power supply</description>
+    </tag>
+    <tag id="0x0003" name="ACPhase2">
+      <description>Indicates values measured for an AC load on phase 2 of a polyphase power supply</description>
+    </tag>
+    <tag id="0x0004" name="ACPhase3">
+      <description>Indicates values measured for an AC load on phase 3 of a polyphase power supply</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-IdentifiedHumanActivity.xml b/data_model/1.6/namespaces/Namespace-IdentifiedHumanActivity.xml
new file mode 100644
index 00000000000..fe01d952982
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-IdentifiedHumanActivity.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x004B" name="Identified Human Activity">
+  <tags>
+    <tag id="0x0000" name="Unknown">
+      <description>Unknown human activity is detected.</description>
+    </tag>
+    <tag id="0x0001" name="Fall">
+      <description>Human fall is detected.</description>
+    </tag>
+    <tag id="0x0002" name="Sleeping">
+      <description>Human sleeping is detected.</description>
+    </tag>
+    <tag id="0x0003" name="Walking">
+      <description>Human walking is detected.</description>
+    </tag>
+    <tag id="0x0004" name="Workout">
+      <description>Human workout is detected.</description>
+    </tag>
+    <tag id="0x0005" name="Sitting">
+      <description>Human sitting is detected.</description>
+    </tag>
+    <tag id="0x0006" name="Standing">
+      <description>Human standing is detected.</description>
+    </tag>
+    <tag id="0x0007" name="Dancing">
+      <description>Human dancing is detected.</description>
+    </tag>
+    <tag id="0x0008" name="PackageDelivery">
+      <description>Human delivery of package is detected.</description>
+    </tag>
+    <tag id="0x0009" name="PackageRetrieval">
+      <description>Human retrieval of package is detected.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-IdentifiedObject.xml b/data_model/1.6/namespaces/Namespace-IdentifiedObject.xml
new file mode 100644
index 00000000000..1a084cf3f55
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-IdentifiedObject.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0049" name="Identified Object">
+  <tags>
+    <tag id="0x0000" name="Unknown">
+      <description>Unknown object is detected.</description>
+    </tag>
+    <tag id="0x0001" name="Adult">
+      <description>Human adult is detected.</description>
+    </tag>
+    <tag id="0x0002" name="Child">
+      <description>Human child is detected.</description>
+    </tag>
+    <tag id="0x0003" name="Person">
+      <description>Person is detected.</description>
+    </tag>
+    <tag id="0x0004" name="RVC">
+      <description>Robot Vacuum Cleaner is detected.</description>
+    </tag>
+    <tag id="0x0005" name="Pet">
+      <description>Pet animal is detected.</description>
+    </tag>
+    <tag id="0x0006" name="Dog">
+      <description>Dog is detected.</description>
+    </tag>
+    <tag id="0x0007" name="Cat">
+      <description>Cat is detected.</description>
+    </tag>
+    <tag id="0x0008" name="Animal">
+      <description>Animal is detected.</description>
+    </tag>
+    <tag id="0x0009" name="Car">
+      <description>Car is detected.</description>
+    </tag>
+    <tag id="0x000A" name="Vehicle">
+      <description>Vehicle is detected.</description>
+    </tag>
+    <tag id="0x000B" name="Package">
+      <description>Package is detected.</description>
+    </tag>
+    <tag id="0x000C" name="Clothes">
+      <description>Clothes are detected.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-IdentifiedSound.xml b/data_model/1.6/namespaces/Namespace-IdentifiedSound.xml
new file mode 100644
index 00000000000..41b0831e9a0
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-IdentifiedSound.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2026). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x004A" name="Identified Sound">
+  <tags>
+    <tag id="0x0000" name="Unknown">
+      <description>Unidentifiable audio context is detected.</description>
+    </tag>
+    <tag id="0x0001" name="ObjectFall">
+      <description>Object falling to the floor is detected.</description>
+    </tag>
+    <tag id="0x0002" name="Snoring">
+      <description>Human snoring sound is detected.</description>
+    </tag>
+    <tag id="0x0003" name="Coughing">
+      <description>Human coughing sound is detected.</description>
+    </tag>
+    <tag id="0x0004" name="Barking">
+      <description>Dog barking sound is detected.</description>
+    </tag>
+    <tag id="0x0005" name="Shattering">
+      <description>Object shattering sound is detected.</description>
+    </tag>
+    <tag id="0x0006" name="BabyCrying">
+      <description>Baby crying sound is detected.</description>
+    </tag>
+    <tag id="0x0007" name="UtilityAlarm">
+      <description>Utility device alarming or warning sound is detected.</description>
+    </tag>
+    <tag id="0x0008" name="UrgentShouting">
+      <description>Urgent shouting sound is detected.</description>
+    </tag>
+    <tag id="0x0009" name="Doorbell">
+      <description>Doorbell ringing is detected.</description>
+    </tag>
+    <tag id="0x000A" name="Knocking">
+      <description>Door knocking sound is detected.</description>
+    </tag>
+    <tag id="0x000B" name="UrgentSiren">
+      <description>Urgent situational siren sound is detected.</description>
+    </tag>
+    <tag id="0x000C" name="FaucetRunning">
+      <description>Faucet water running sound is detected.</description>
+    </tag>
+    <tag id="0x000D" name="KettleBoiling">
+      <description>Kettle water boiling sound is detected.</description>
+    </tag>
+    <tag id="0x000E" name="FanDryer">
+      <description>Hair/hand fan dryer sound is detected.</description>
+    </tag>
+    <tag id="0x000F" name="Clapping">
+      <description>Hand clapping sound is detected.</description>
+    </tag>
+    <tag id="0x0010" name="FingerSnapping">
+      <description>Finger snapping sound is detected.</description>
+    </tag>
+    <tag id="0x0011" name="Meowing">
+      <description>Cat meowing sound is detected.</description>
+    </tag>
+    <tag id="0x0012" name="Laughing">
+      <description>Human laughing sound is detected.</description>
+    </tag>
+    <tag id="0x0013" name="GlassBreaking">
+      <description>Glass breaking sound is detected.</description>
+    </tag>
+    <tag id="0x0014" name="DoorKnocking">
+      <description>Door knocking sound is detected.</description>
+    </tag>
+    <tag id="0x0015" name="PersonTalking">
+      <description>Person talking sound is detected.</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Laundry.xml b/data_model/1.6/namespaces/Namespace-Laundry.xml
new file mode 100644
index 00000000000..aeadaca1b63
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Laundry.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x000E" name="Laundry">
+  <tags>
+    <tag id="0x0000" name="Normal"/>
+    <tag id="0x0001" name="LightDry"/>
+    <tag id="0x0002" name="ExtraDry"/>
+    <tag id="0x0003" name="NoDry"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-PowerSource.xml b/data_model/1.6/namespaces/Namespace-PowerSource.xml
new file mode 100644
index 00000000000..37523a1a8b0
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-PowerSource.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x000F" name="Power Source">
+  <tags>
+    <tag id="0x0000" name="Unknown">
+      <description>The Power Source cluster is related to power provided from an unknown source</description>
+    </tag>
+    <tag id="0x0001" name="Grid">
+      <description>The Power Source cluster is related to power provided from the electrical grid</description>
+    </tag>
+    <tag id="0x0002" name="Solar">
+      <description>The Power Source cluster is related to power provided from a solar panel array</description>
+    </tag>
+    <tag id="0x0003" name="Battery">
+      <description>The Power Source cluster is related to power provided from a battery</description>
+    </tag>
+    <tag id="0x0004" name="EV">
+      <description>The Power Source cluster is related to power provided from an electric vehicle</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Refrigerator.xml b/data_model/1.6/namespaces/Namespace-Refrigerator.xml
new file mode 100644
index 00000000000..d823a0016cc
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Refrigerator.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0041" name="Refrigerator">
+  <tags>
+    <tag id="0x0000" name="Refrigerator"/>
+    <tag id="0x0001" name="Freezer"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-RoomAirConditioner.xml b/data_model/1.6/namespaces/Namespace-RoomAirConditioner.xml
new file mode 100644
index 00000000000..9697586acf1
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-RoomAirConditioner.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0042" name="Room Air Conditioner">
+  <tags>
+    <tag id="0x0000" name="Evaporator"/>
+    <tag id="0x0001" name="Condenser"/>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/namespaces/Namespace-Switches.xml b/data_model/1.6/namespaces/Namespace-Switches.xml
new file mode 100644
index 00000000000..de727394e37
--- /dev/null
+++ b/data_model/1.6/namespaces/Namespace-Switches.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+
+:xrefstyle: basic
+-->
+<namespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd namespace namespace.xsd" id="0x0043" name="Switches">
+  <tags>
+    <tag id="0x0000" name="On"/>
+    <tag id="0x0001" name="Off"/>
+    <tag id="0x0002" name="Toggle"/>
+    <tag id="0x0003" name="Up">
+      <description>e.g. dim up (light)</description>
+    </tag>
+    <tag id="0x0004" name="Down">
+      <description>e.g. dim down (light)</description>
+    </tag>
+    <tag id="0x0005" name="Next">
+      <description>e.g. select next scene</description>
+    </tag>
+    <tag id="0x0006" name="Previous">
+      <description>e.g. select previous scene</description>
+    </tag>
+    <tag id="0x0007" name="EnterOkSelect">
+      <description>Enter/OK/Select function</description>
+    </tag>
+    <tag id="0x0008" name="Custom">
+      <description>Textual description provided in Label field</description>
+    </tag>
+    <tag id="0x0009" name="Open">
+      <description>e.g. open window covering</description>
+    </tag>
+    <tag id="0x000A" name="Close">
+      <description>e.g. close window covering</description>
+    </tag>
+    <tag id="0x000B" name="Stop">
+      <description>e.g. stop moving window covering</description>
+    </tag>
+  </tags>
+</namespace>
diff --git a/data_model/1.6/scraper_version b/data_model/1.6/scraper_version
new file mode 100644
index 00000000000..af512f36feb
--- /dev/null
+++ b/data_model/1.6/scraper_version
@@ -0,0 +1 @@
+alchemy version: v1.6.9
diff --git a/data_model/1.6/spec_sha b/data_model/1.6/spec_sha
new file mode 100644
index 00000000000..252c1926515
--- /dev/null
+++ b/data_model/1.6/spec_sha
@@ -0,0 +1 @@
+1cbcdd626ab769a5584be93c5844ad3a9aa2ee44
diff --git a/data_model/1.6/spec_tag b/data_model/1.6/spec_tag
new file mode 100644
index 00000000000..eb1c2aa040c
--- /dev/null
+++ b/data_model/1.6/spec_tag
@@ -0,0 +1 @@
+0.9-summer2026
diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
index 17607b45c87..407f9d9a50b 100644
--- a/docs/guides/BUILDING.md
+++ b/docs/guides/BUILDING.md
@@ -91,7 +91,7 @@ satisfied with the following command:
 sudo apt-get install git gcc g++ pkg-config cmake curl libssl-dev libdbus-1-dev \
      libglib2.0-dev libavahi-client-dev ninja-build python3-venv python3-dev \
      python3-pip unzip libgirepository1.0-dev libcairo2-dev libreadline-dev \
-     default-jre
+     libevent-dev default-jre
 ```
 
 #### Upgrading Python on Ubuntu 22.04
diff --git a/docs/guides/writing_clusters.md b/docs/guides/writing_clusters.md
index 9a6907033ff..5461a7241cf 100644
--- a/docs/guides/writing_clusters.md
+++ b/docs/guides/writing_clusters.md
@@ -85,6 +85,50 @@ cluster is a good example of this pattern.
         interactions. We recommend the term `Driver` to avoid confusion with the
         overloaded term `Delegate`.
 
+### Design Principles
+
+When designing and implementing a cluster, adhere to the following principles to
+ensure a high-quality and developer-friendly experience:
+
+#### Prioritize Easy Application Development
+
+Clusters should aim to do as much work as possible autonomously, reducing the
+burden on the application developer.
+
+-   **Handle Common Logic Internally:** Implement persistence (NVM), timers, and
+    complex state machines within the cluster itself. The application should
+    only be notified of significant events or changes it needs to act upon. _For
+    example, a state machine managing a multi-step process like a firmware
+    update, door lock/unlock sequence with retries, or a calibration procedure
+    should typically reside within the cluster, rather than requiring the
+    application to manage the intermediate steps and timeouts._
+-   **Provide Helper Abstractions:** If a cluster requires the application to
+    implement complex logic, consider providing helper classes or default
+    implementations that simplify the task.
+-   **Encapsulate Complexity:** Avoid deferring low-level details (like raw
+    storage keys or individual timer management) to the application.
+
+#### Delegate/Driver Pattern for Validation
+
+When an application needs to be involved in a cluster operation (especially
+writes or commands), use a delegate (or driver) interface that acts as a
+"pre-check."
+
+-   **Pre-Write Validation:** For writable attributes, provide a callback that
+    allows the application to accept or reject the new value _before_ it is
+    applied to the cluster's internal state or persisted.
+-   **Delegate Veto:** Callbacks must return a
+    `Protocols::InteractionModel::Status`. Returning any status other than
+    Success allows the application to reject the proposed change. The cluster
+    MUST honor this by failing the operation and propagating the delegate's
+    status code to the initiator.
+-   **Perform Cluster-Level Checks First:** The cluster remains responsible for
+    all spec-defined validations (e.g., range checks, constraint validations, or
+    state-based restrictions) before involving the application delegate.
+-   **Avoid Redundant Notifications:** Ensure that no-op operations (e.g.,
+    writing the same value that is already present) are handled early and do not
+    trigger delegate callbacks or change notifications.
+
 ### Choosing the Right Implementation Pattern
 
 When implementing a cluster, you have two primary architectural choices: a
@@ -267,22 +311,27 @@ attribute's value changes.
     -   For the `NotifyAttributeChangedIfSuccess` ensure that WriteImpl is
         returning
         [ActionReturnStatus::FixedStatus::kWriteSuccessNoOp](https://github.com/project-chip/connectedhomeip/blob/master/src/app/data-model-provider/ActionReturnStatus.h)
-        when no notification should be sent (e.g. write was a `noop` because
-        existing value was already the same).
+        when no notification should be sent.
+
+        **Crucial:** No-op writes (where the value remains unchanged) MUST NOT
+        trigger:
+
+        -   Network attribute change notifications.
+        -   Application-level delegate/driver callbacks.
 
         Canonical example is:
 
         ```cpp
-        VerifyOrReturnValue(mValue != value, ActionReturnStatus::FixedStatus::kWriteSuccessNoOp);
+        VerifyOrReturnValue(mValue != newValue, ActionReturnStatus::FixedStatus::kWriteSuccessNoOp);
         ```
 
 -   **OnClusterAttributeChanged Pattern:** Each cluster should implement a
     centralized helper method (e.g., `OnClusterAttributeChanged(AttributeId)`)
     that combines both network and application notifications.
     -   Call `NotifyAttributeChanged()` to notify network subscribers.
-    -   Call delegate callbacks to notify the application layer.
-    -   Invoke this method from `WriteAttribute`, `InvokeCommand`, and setter
-        methods.
+    -   Call delegate callbacks to notify the application layer of the _actual_
+        change.
+    -   Invoke this method only when a value has truly changed.
     -   **Example:** See
         [Boolean State Configuration](https://github.com/project-chip/connectedhomeip/blob/master/src/app/clusters/boolean-state-configuration-server/BooleanStateConfigurationCluster.h)
         which declares `OnClusterAttributeChanged(AttributeId)` as a private
diff --git a/docs/ids_and_codes/spec_clusters.md b/docs/ids_and_codes/spec_clusters.md
index 2f49ea9d0cf..c65ad241862 100644
--- a/docs/ids_and_codes/spec_clusters.md
+++ b/docs/ids_and_codes/spec_clusters.md
@@ -9,145 +9,149 @@ The following markers are used in this document (matches the ID master list):
 | C     | Certifiable                    |
 | P     | Provisional                    |
 
-| ID (Decimal) | ID (hex) | Name                                                     | PICS Code     |1.0|1.1|1.2|1.3|1.4|1.4.1|1.4.2-mve-1|1.5|0.9-winter-2026|
-|--------------|----------|----------------------------------------------------------|---------------|---|---|---|---|---|-----|-----------|---|---------------|
-|3             |0x0003    |Identify                                                  |I              |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|4             |0x0004    |Groups                                                    |G              |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|5             |0x0005    |Scenes                                                    |S              |C  |C  |C  |   |   |     |           |   |               |
-|6             |0x0006    |On/Off                                                    |OO             |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|8             |0x0008    |Level Control                                             |LVL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|28            |0x001C    |Pulse Width Modulation                                    |PWM            |C  |C  |C  |P  |   |     |           |   |               |
-|29            |0x001D    |Descriptor                                                |DESC           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|30            |0x001E    |Binding                                                   |BIND           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|31            |0x001F    |Access Control                                            |ACL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|37            |0x0025    |Actions                                                   |ACT            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|40            |0x0028    |Basic Information                                         |BINFO          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|41            |0x0029    |OTA Software Update Provider                              |OTAP           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|42            |0x002A    |OTA Software Update Requestor                             |OTAR           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|43            |0x002B    |Localization Configuration                                |LCFG           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|44            |0x002C    |Time Format Localization                                  |LTIME          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|45            |0x002D    |Unit Localization                                         |LUNIT          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|46            |0x002E    |Power Source Configuration                                |PSCFG          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|47            |0x002F    |Power Source                                              |PS             |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|48            |0x0030    |General Commissioning                                     |CGEN           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|49            |0x0031    |Network Commissioning                                     |CNET           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|50            |0x0032    |Diagnostic Logs                                           |DLOG           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|51            |0x0033    |General Diagnostics                                       |DGGEN          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|52            |0x0034    |Software Diagnostics                                      |DGSW           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|53            |0x0035    |Thread Network Diagnostics                                |DGTHREAD       |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|54            |0x0036    |Wi-Fi Network Diagnostics                                 |DGWIFI         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|55            |0x0037    |Ethernet Network Diagnostics                              |DGETH          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|56            |0x0038    |Time Synchronization                                      |TIMESYNC       |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|57            |0x0039    |Bridged Device Basic Information                          |BRBINFO        |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|59            |0x003B    |Switch                                                    |SWTCH          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|60            |0x003C    |Administrator Commissioning                               |CADMIN         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|62            |0x003E    |Operational Credentials                                   |OPCREDS        |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|63            |0x003F    |Group Key Management                                      |GRPKEY         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|64            |0x0040    |Fixed Label                                               |FLABEL         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|65            |0x0041    |User Label                                                |ULABEL         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|66            |0x0042    |Proxy Configuration                                       |PXCFG          |C  |C  |C  |P  |P  |P    |           |   |               |
-|67            |0x0043    |Proxy Discovery                                           |PXDSC          |C  |C  |C  |P  |P  |P    |           |   |               |
-|68            |0x0044    |Valid Proxies                                             |PXVALID        |C  |C  |C  |P  |P  |P    |           |   |               |
-|69            |0x0045    |Boolean State                                             |BOOL           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|70            |0x0046    |ICD Management                                            |ICDM           |   |   |C  |C  |C  |C    |C          |C  |C              |
-|72            |0x0048    |Oven Cavity Operational State                             |OVENOPSTATE    |   |   |   |C  |C  |C    |C          |C  |C              |
-|73            |0x0049    |Oven Mode                                                 |OTCCM          |   |   |   |C  |C  |C    |C          |C  |C              |
-|74            |0x004A    |Laundry Dryer Controls                                    |DRYERCTRL      |   |   |   |C  |C  |C    |C          |C  |C              |
-|80            |0x0050    |Mode Select                                               |MOD            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|81            |0x0051    |Laundry Washer Mode                                       |LWM            |   |   |C  |C  |C  |C    |C          |C  |C              |
-|82            |0x0052    |Refrigerator And Temperature Controlled Cabinet Mode      |TCCM           |   |   |C  |C  |C  |C    |C          |C  |C              |
-|83            |0x0053    |Laundry Washer Controls                                   |WASHERCTRL     |   |   |C  |C  |C  |C    |C          |C  |C              |
-|84            |0x0054    |RVC Run Mode                                              |RVCRUNM        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|85            |0x0055    |RVC Clean Mode                                            |RVCCLEANM      |   |   |C  |C  |C  |C    |C          |C  |C              |
-|86            |0x0056    |Temperature Control                                       |TCTL           |   |   |C  |C  |C  |C    |C          |C  |C              |
-|87            |0x0057    |Refrigerator Alarm                                        |REFALM         |   |   |C  |C  |C  |C    |C          |C  |C              |
-|89            |0x0059    |Dishwasher Mode                                           |DISHM          |   |   |C  |C  |C  |C    |C          |C  |C              |
-|91            |0x005B    |Air Quality                                               |AIRQUAL        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|92            |0x005C    |Smoke CO Alarm                                            |SMOKECO        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|93            |0x005D    |Dishwasher Alarm                                          |DISHALM        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|94            |0x005E    |Microwave Oven Mode                                       |MWOM           |   |   |   |C  |C  |C    |C          |C  |C              |
-|95            |0x005F    |Microwave Oven Control                                    |MWOCTRL        |   |   |   |C  |C  |C    |C          |C  |C              |
-|96            |0x0060    |Operational State                                         |OPSTATE        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|97            |0x0061    |RVC Operational State                                     |RVCOPSTATE     |   |   |C  |C  |C  |C    |C          |C  |C              |
-|98            |0x0062    |Scenes Management                                         |S              |   |   |   |P  |P  |P    |C          |C  |C              |
-|113           |0x0071    |HEPA Filter Monitoring                                    |HEPAFREMON     |   |   |C  |C  |C  |C    |C          |C  |C              |
-|114           |0x0072    |Activated Carbon Filter Monitoring                        |ACFREMON       |   |   |C  |C  |C  |C    |C          |C  |C              |
-|121           |0x0079    |Water Tank Level Monitoring                               |REPM           |   |   |   |   |C  |C    |C          |C  |C              |
-|128           |0x0080    |Boolean State Configuration                               |BOOLCFG        |   |   |   |C  |C  |C    |C          |C  |C              |
-|129           |0x0081    |Valve Configuration and Control                           |VALCC          |   |   |   |C  |C  |C    |C          |C  |C              |
-|144           |0x0090    |Electrical Power Measurement                              |EPM            |   |   |   |C  |C  |C    |C          |C  |C              |
-|145           |0x0091    |Electrical Energy Measurement                             |EEM            |   |   |   |C  |C  |C    |C          |C  |C              |
-|148           |0x0094    |Water Heater Management                                   |EWATERHTR      |   |   |   |   |C  |C    |C          |C  |C              |
-|149           |0x0095    |Commodity Price                                           |SEPR           |   |   |   |   |   |     |           |C  |C              |
-|151           |0x0097    |Messages                                                  |MESS           |   |   |   |C  |C  |C    |C          |C  |C              |
-|152           |0x0098    |Device Energy Management                                  |DEM            |   |   |   |P  |C  |C    |C          |C  |C              |
-|153           |0x0099    |Energy EVSE                                               |EEVSE          |   |   |   |C  |C  |C    |C          |C  |C              |
-|155           |0x009B    |Energy Preference                                         |EPREF          |   |   |   |P  |P  |P    |P          |P  |P              |
-|156           |0x009C    |Power Topology                                            |PWRTL          |   |   |   |C  |C  |C    |C          |C  |C              |
-|157           |0x009D    |Energy EVSE Mode                                          |EEVSEM         |   |   |   |C  |C  |C    |C          |C  |C              |
-|158           |0x009E    |Water Heater Mode                                         |WHM            |   |   |   |   |C  |C    |C          |C  |C              |
-|159           |0x009F    |Device Energy Management Mode                             |DEMM           |   |   |   |P  |C  |C    |C          |C  |C              |
-|160           |0x00A0    |Electrical Grid Conditions                                |EGC            |   |   |   |   |   |     |           |C  |C              |
-|257           |0x0101    |Door Lock                                                 |DRLK           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|258           |0x0102    |Window Covering                                           |WNCV           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|260           |0x0104    |Closure Control                                           |CLCTRL         |   |   |   |   |   |     |           |C  |C              |
-|261           |0x0105    |Closure Dimension                                         |CLDIM          |   |   |   |   |   |     |           |C  |C              |
-|336           |0x0150    |Service Area                                              |SEAR           |   |   |   |   |C  |C    |C          |C  |C              |
-|512           |0x0200    |Pump Configuration and Control                            |PCC            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|513           |0x0201    |Thermostat                                                |TSTAT          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|514           |0x0202    |Fan Control                                               |FAN            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|516           |0x0204    |Thermostat User Interface Configuration                   |TSUIC          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|768           |0x0300    |Color Control                                             |CC             |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|769           |0x0301    |Ballast Configuration                                     |BC             |C  |C  |C  |P  |P  |P    |           |   |               |
-|1024          |0x0400    |Illuminance Measurement                                   |ILL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1026          |0x0402    |Temperature Measurement                                   |TMP            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1027          |0x0403    |Pressure Measurement                                      |PRS            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1028          |0x0404    |Flow Measurement                                          |FLW            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1029          |0x0405    |Relative Humidity Measurement                             |RH             |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1030          |0x0406    |Occupancy Sensing                                         |OCC            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1031          |0x0407    |Leaf Wetness Measurement                                  |RH             |C  |C  |C  |   |   |     |           |   |               |
-|1032          |0x0408    |Soil Moisture Measurement                                 |RH             |C  |C  |C  |   |   |     |           |   |               |
-|1036          |0x040C    |Carbon Monoxide Concentration Measurement                 |CMOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1037          |0x040D    |Carbon Dioxide Concentration Measurement                  |CDOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1043          |0x0413    |Nitrogen Dioxide Concentration Measurement                |NDOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1045          |0x0415    |Ozone Concentration Measurement                           |OZCONC         |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1066          |0x042A    |PM2.5 Concentration Measurement                           |PMICONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1067          |0x042B    |Formaldehyde Concentration Measurement                    |FLDCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1068          |0x042C    |PM1 Concentration Measurement                             |PMHCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1069          |0x042D    |PM10 Concentration Measurement                            |PMKCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1070          |0x042E    |Total Volatile Organic Compounds Concentration Measurement|TVOCCONC       |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1071          |0x042F    |Radon Concentration Measurement                           |RNCONC         |   |   |C  |C  |C  |C    |C          |C  |C              |
-|1072          |0x0430    |Soil Measurement                                          |SOIL           |   |   |   |   |   |     |           |C  |C              |
-|1105          |0x0451    |Wi-Fi Network Management                                  |WIFINM         |   |   |   |   |C  |C    |C          |C  |C              |
-|1106          |0x0452    |Thread Border Router Management                           |TBRM           |   |   |   |   |C  |C    |C          |C  |C              |
-|1107          |0x0453    |Thread Network Directory                                  |THNETDIR       |   |   |   |   |C  |C    |C          |C  |C              |
-|1283          |0x0503    |Wake On LAN                                               |WAKEONLAN      |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1284          |0x0504    |Channel                                                   |CHANNEL        |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1285          |0x0505    |Target Navigator                                          |TGTNAV         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1286          |0x0506    |Media Playback                                            |MEDIAPLAYBACK  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1287          |0x0507    |Media Input                                               |MEDIAINPUT     |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1288          |0x0508    |Low Power                                                 |LOWPOWER       |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1289          |0x0509    |Keypad Input                                              |KEYPADINPUT    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1290          |0x050A    |Content Launcher                                          |CONTENTLAUNCHER|C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1291          |0x050B    |Audio Output                                              |AUDIOOUTPUT    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1292          |0x050C    |Application Launcher                                      |APPLAUNCHER    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1293          |0x050D    |Application Basic                                         |APBSC          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1294          |0x050E    |Account Login                                             |ALOGIN         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|1295          |0x050F    |Content Control                                           |CONCON         |   |   |   |P  |P  |P    |P          |P  |P              |
-|1296          |0x0510    |Content App Observer                                      |APPOBSERVER    |   |   |   |C  |C  |C    |C          |C  |C              |
-|1360          |0x0550    |Zone Management                                           |ZONEMGMT       |   |   |   |   |   |     |           |C  |C              |
-|1361          |0x0551    |Camera AV Stream Management                               |AVSM           |   |   |   |   |   |     |           |C  |C              |
-|1362          |0x0552    |Camera AV Settings User Level Management                  |AVSUM          |   |   |   |   |   |     |           |C  |C              |
-|1363          |0x0553    |WebRTC Transport Provider                                 |WEBRTCP        |   |   |   |   |   |     |           |C  |C              |
-|1364          |0x0554    |WebRTC Transport Requestor                                |WEBRTCR        |   |   |   |   |   |     |           |C  |C              |
-|1365          |0x0555    |Push AV Stream Transport                                  |PAVST          |   |   |   |   |   |     |           |C  |C              |
-|1366          |0x0556    |Chime                                                     |CHIME          |   |   |   |   |   |     |           |C  |C              |
-|1792          |0x0700    |Commodity Tariff                                          |SETRF          |   |   |   |   |   |     |           |C  |C              |
-|1872          |0x0750    |Ecosystem Information                                     |ECOINFO        |   |   |   |   |C  |C    |C          |C  |C              |
-|1873          |0x0751    |Commissioner Control                                      |CCTRL          |   |   |   |   |C  |C    |C          |C  |C              |
-|1874          |0x0752    |Joint Fabric Datastore                                    |JFDS           |   |   |   |   |P  |P    |P          |P  |P              |
-|1875          |0x0753    |Joint Fabric Administrator                                |JFPKI          |   |   |   |   |P  |P    |P          |P  |P              |
-|2049          |0x0801    |TLS Certificate Management                                |TLSCERT        |   |   |   |   |   |     |           |C  |C              |
-|2050          |0x0802    |TLS Client Management                                     |TLSCLIENT      |   |   |   |   |   |     |           |C  |C              |
-|2822          |0x0B06    |Meter Identification                                      |MTRID          |   |   |   |   |   |     |           |C  |C              |
-|2823          |0x0B07    |Commodity Metering                                        |COMMTR         |   |   |   |   |   |     |           |C  |C              |
+| ID (Decimal) | ID (hex) | Name                                                     | PICS Code     |1.0|1.1|1.2|1.3|1.4|1.4.1|1.4.2-mve-1|1.5|0.9-winter-2026|0.9-summer2026|
+|--------------|----------|----------------------------------------------------------|---------------|---|---|---|---|---|-----|-----------|---|---------------|--------------|
+|3             |0x0003    |Identify                                                  |I              |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|4             |0x0004    |Groups                                                    |G              |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|5             |0x0005    |Scenes                                                    |S              |C  |C  |C  |   |   |     |           |   |               |              |
+|6             |0x0006    |On/Off                                                    |OO             |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|8             |0x0008    |Level Control                                             |LVL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|28            |0x001C    |Pulse Width Modulation                                    |PWM            |C  |C  |C  |P  |   |     |           |   |               |              |
+|29            |0x001D    |Descriptor                                                |DESC           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|30            |0x001E    |Binding                                                   |BIND           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|31            |0x001F    |Access Control                                            |ACL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|37            |0x0025    |Actions                                                   |ACT            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|40            |0x0028    |Basic Information                                         |BINFO          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|41            |0x0029    |OTA Software Update Provider                              |OTAP           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|42            |0x002A    |OTA Software Update Requestor                             |OTAR           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|43            |0x002B    |Localization Configuration                                |LCFG           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|44            |0x002C    |Time Format Localization                                  |LTIME          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|45            |0x002D    |Unit Localization                                         |LUNIT          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|46            |0x002E    |Power Source Configuration                                |PSCFG          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|47            |0x002F    |Power Source                                              |PS             |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|48            |0x0030    |General Commissioning                                     |CGEN           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|49            |0x0031    |Network Commissioning                                     |CNET           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|50            |0x0032    |Diagnostic Logs                                           |DLOG           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|51            |0x0033    |General Diagnostics                                       |DGGEN          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|52            |0x0034    |Software Diagnostics                                      |DGSW           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|53            |0x0035    |Thread Network Diagnostics                                |DGTHREAD       |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|54            |0x0036    |Wi-Fi Network Diagnostics                                 |DGWIFI         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|55            |0x0037    |Ethernet Network Diagnostics                              |DGETH          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|56            |0x0038    |Time Synchronization                                      |TIMESYNC       |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|57            |0x0039    |Bridged Device Basic Information                          |BRBINFO        |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|59            |0x003B    |Switch                                                    |SWTCH          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|60            |0x003C    |Administrator Commissioning                               |CADMIN         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|62            |0x003E    |Operational Credentials                                   |OPCREDS        |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|63            |0x003F    |Group Key Management                                      |GRPKEY         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|64            |0x0040    |Fixed Label                                               |FLABEL         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|65            |0x0041    |User Label                                                |ULABEL         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|66            |0x0042    |Proxy Configuration                                       |PXCFG          |C  |C  |C  |P  |P  |P    |           |   |               |              |
+|67            |0x0043    |Proxy Discovery                                           |PXDSC          |C  |C  |C  |P  |P  |P    |           |   |               |              |
+|68            |0x0044    |Valid Proxies                                             |PXVALID        |C  |C  |C  |P  |P  |P    |           |   |               |              |
+|69            |0x0045    |Boolean State                                             |BOOL           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|70            |0x0046    |ICD Management                                            |ICDM           |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|72            |0x0048    |Oven Cavity Operational State                             |OVENOPSTATE    |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|73            |0x0049    |Oven Mode                                                 |OTCCM          |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|74            |0x004A    |Laundry Dryer Controls                                    |DRYERCTRL      |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|80            |0x0050    |Mode Select                                               |MOD            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|81            |0x0051    |Laundry Washer Mode                                       |LWM            |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|82            |0x0052    |Refrigerator And Temperature Controlled Cabinet Mode      |TCCM           |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|83            |0x0053    |Laundry Washer Controls                                   |WASHERCTRL     |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|84            |0x0054    |RVC Run Mode                                              |RVCRUNM        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|85            |0x0055    |RVC Clean Mode                                            |RVCCLEANM      |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|86            |0x0056    |Temperature Control                                       |TCTL           |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|87            |0x0057    |Refrigerator Alarm                                        |REFALM         |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|89            |0x0059    |Dishwasher Mode                                           |DISHM          |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|91            |0x005B    |Air Quality                                               |AIRQUAL        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|92            |0x005C    |Smoke CO Alarm                                            |SMOKECO        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|93            |0x005D    |Dishwasher Alarm                                          |DISHALM        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|94            |0x005E    |Microwave Oven Mode                                       |MWOM           |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|95            |0x005F    |Microwave Oven Control                                    |MWOCTRL        |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|96            |0x0060    |Operational State                                         |OPSTATE        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|97            |0x0061    |RVC Operational State                                     |RVCOPSTATE     |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|98            |0x0062    |Scenes Management                                         |S              |   |   |   |P  |P  |P    |C          |C  |C              |C             |
+|100           |0x0064    |Temperature Alarm                                         |TEMPALM        |   |   |   |   |   |     |           |   |               |P             |
+|101           |0x0065    |Groupcast                                                 |GC             |   |   |   |   |   |     |           |   |               |P             |
+|113           |0x0071    |HEPA Filter Monitoring                                    |HEPAFREMON     |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|114           |0x0072    |Activated Carbon Filter Monitoring                        |ACFREMON       |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|121           |0x0079    |Water Tank Level Monitoring                               |REPM           |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|128           |0x0080    |Boolean State Configuration                               |BOOLCFG        |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|129           |0x0081    |Valve Configuration and Control                           |VALCC          |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|144           |0x0090    |Electrical Power Measurement                              |EPM            |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|145           |0x0091    |Electrical Energy Measurement                             |EEM            |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|148           |0x0094    |Water Heater Management                                   |EWATERHTR      |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|149           |0x0095    |Commodity Price                                           |SEPR           |   |   |   |   |   |     |           |C  |C              |C             |
+|151           |0x0097    |Messages                                                  |MESS           |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|152           |0x0098    |Device Energy Management                                  |DEM            |   |   |   |P  |C  |C    |C          |C  |C              |C             |
+|153           |0x0099    |Energy EVSE                                               |EEVSE          |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|155           |0x009B    |Energy Preference                                         |EPREF          |   |   |   |P  |P  |P    |P          |P  |P              |P             |
+|156           |0x009C    |Power Topology                                            |PWRTL          |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|157           |0x009D    |Energy EVSE Mode                                          |EEVSEM         |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|158           |0x009E    |Water Heater Mode                                         |WHM            |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|159           |0x009F    |Device Energy Management Mode                             |DEMM           |   |   |   |P  |C  |C    |C          |C  |C              |C             |
+|160           |0x00A0    |Electrical Grid Conditions                                |EGC            |   |   |   |   |   |     |           |C  |C              |C             |
+|257           |0x0101    |Door Lock                                                 |DRLK           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|258           |0x0102    |Window Covering                                           |WNCV           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|260           |0x0104    |Closure Control                                           |CLCTRL         |   |   |   |   |   |     |           |C  |C              |C             |
+|261           |0x0105    |Closure Dimension                                         |CLDIM          |   |   |   |   |   |     |           |C  |C              |C             |
+|336           |0x0150    |Service Area                                              |SEAR           |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|512           |0x0200    |Pump Configuration and Control                            |PCC            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|513           |0x0201    |Thermostat                                                |TSTAT          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|514           |0x0202    |Fan Control                                               |FAN            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|516           |0x0204    |Thermostat User Interface Configuration                   |TSUIC          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|768           |0x0300    |Color Control                                             |CC             |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|769           |0x0301    |Ballast Configuration                                     |BC             |C  |C  |C  |P  |P  |P    |           |   |               |              |
+|1024          |0x0400    |Illuminance Measurement                                   |ILL            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1026          |0x0402    |Temperature Measurement                                   |TMP            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1027          |0x0403    |Pressure Measurement                                      |PRS            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1028          |0x0404    |Flow Measurement                                          |FLW            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1029          |0x0405    |Relative Humidity Measurement                             |RH             |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1030          |0x0406    |Occupancy Sensing                                         |OCC            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1031          |0x0407    |Leaf Wetness Measurement                                  |RH             |C  |C  |C  |   |   |     |           |   |               |              |
+|1032          |0x0408    |Soil Moisture Measurement                                 |RH             |C  |C  |C  |   |   |     |           |   |               |              |
+|1036          |0x040C    |Carbon Monoxide Concentration Measurement                 |CMOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1037          |0x040D    |Carbon Dioxide Concentration Measurement                  |CDOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1043          |0x0413    |Nitrogen Dioxide Concentration Measurement                |NDOCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1045          |0x0415    |Ozone Concentration Measurement                           |OZCONC         |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1066          |0x042A    |PM2.5 Concentration Measurement                           |PMICONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1067          |0x042B    |Formaldehyde Concentration Measurement                    |FLDCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1068          |0x042C    |PM1 Concentration Measurement                             |PMHCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1069          |0x042D    |PM10 Concentration Measurement                            |PMKCONC        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1070          |0x042E    |Total Volatile Organic Compounds Concentration Measurement|TVOCCONC       |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1071          |0x042F    |Radon Concentration Measurement                           |RNCONC         |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|1072          |0x0430    |Soil Measurement                                          |SOIL           |   |   |   |   |   |     |           |C  |C              |C             |
+|1104          |0x0450    |Network Identity Management                               |NETIM          |   |   |   |   |   |     |           |   |               |P             |
+|1105          |0x0451    |Wi-Fi Network Management                                  |WIFINM         |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1106          |0x0452    |Thread Border Router Management                           |TBRM           |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1107          |0x0453    |Thread Network Directory                                  |THNETDIR       |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1108          |0x0454    |Thread Border Router Diagnostics                          |TBRD           |   |   |   |   |   |     |           |   |               |P             |
+|1283          |0x0503    |Wake On LAN                                               |WAKEONLAN      |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1284          |0x0504    |Channel                                                   |CHANNEL        |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1285          |0x0505    |Target Navigator                                          |TGTNAV         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1286          |0x0506    |Media Playback                                            |MEDIAPLAYBACK  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1287          |0x0507    |Media Input                                               |MEDIAINPUT     |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1288          |0x0508    |Low Power                                                 |LOWPOWER       |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1289          |0x0509    |Keypad Input                                              |KEYPADINPUT    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1290          |0x050A    |Content Launcher                                          |CONTENTLAUNCHER|C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1291          |0x050B    |Audio Output                                              |AUDIOOUTPUT    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1292          |0x050C    |Application Launcher                                      |APPLAUNCHER    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1293          |0x050D    |Application Basic                                         |APBSC          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1294          |0x050E    |Account Login                                             |ALOGIN         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|1295          |0x050F    |Content Control                                           |CONCON         |   |   |   |P  |P  |P    |P          |P  |P              |P             |
+|1296          |0x0510    |Content App Observer                                      |APPOBSERVER    |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|1360          |0x0550    |Zone Management                                           |ZONEMGMT       |   |   |   |   |   |     |           |C  |C              |C             |
+|1361          |0x0551    |Camera AV Stream Management                               |AVSM           |   |   |   |   |   |     |           |C  |C              |C             |
+|1362          |0x0552    |Camera AV Settings User Level Management                  |AVSUM          |   |   |   |   |   |     |           |C  |C              |C             |
+|1363          |0x0553    |WebRTC Transport Provider                                 |WEBRTCP        |   |   |   |   |   |     |           |C  |C              |C             |
+|1364          |0x0554    |WebRTC Transport Requestor                                |WEBRTCR        |   |   |   |   |   |     |           |C  |C              |C             |
+|1365          |0x0555    |Push AV Stream Transport                                  |PAVST          |   |   |   |   |   |     |           |C  |C              |C             |
+|1366          |0x0556    |Chime                                                     |CHIME          |   |   |   |   |   |     |           |C  |C              |C             |
+|1792          |0x0700    |Commodity Tariff                                          |SETRF          |   |   |   |   |   |     |           |C  |C              |C             |
+|1872          |0x0750    |Ecosystem Information                                     |ECOINFO        |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1873          |0x0751    |Commissioner Control                                      |CCTRL          |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1874          |0x0752    |Joint Fabric Datastore                                    |JFDS           |   |   |   |   |P  |P    |P          |P  |P              |P             |
+|1875          |0x0753    |Joint Fabric Administrator                                |JFPKI          |   |   |   |   |P  |P    |P          |P  |P              |P             |
+|2049          |0x0801    |TLS Certificate Management                                |TLSCERT        |   |   |   |   |   |     |           |C  |C              |C             |
+|2050          |0x0802    |TLS Client Management                                     |TLSCLIENT      |   |   |   |   |   |     |           |C  |C              |C             |
+|2822          |0x0B06    |Meter Identification                                      |MTRID          |   |   |   |   |   |     |           |C  |C              |C             |
+|2823          |0x0B07    |Commodity Metering                                        |COMMTR         |   |   |   |   |   |     |           |C  |C              |C             |
diff --git a/docs/ids_and_codes/spec_device_types.md b/docs/ids_and_codes/spec_device_types.md
index f64e2c1073b..eb7ec2f56e5 100644
--- a/docs/ids_and_codes/spec_device_types.md
+++ b/docs/ids_and_codes/spec_device_types.md
@@ -9,97 +9,98 @@ The following markers are used in this document (matches the ID master list):
 | C     | Certifiable                    |
 | P     | Provisional                    |
 
-| ID (Decimal) | ID (hex) | Name                         |1.0|1.1|1.2|1.3|1.4|1.4.1|1.4.2-mve-1|1.5|0.9-winter-2026|
-|--------------|----------|------------------------------|---|---|---|---|---|-----|-----------|---|---------------|
-|10            |0x000A    |Door Lock                     |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|11            |0x000B    |Door Lock Controller          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|14            |0x000E    |Aggregator                    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|15            |0x000F    |Generic Switch                |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|17            |0x0011    |Power Source                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|18            |0x0012    |OTA Requestor                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|19            |0x0013    |Bridged Node                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|20            |0x0014    |OTA Provider                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|21            |0x0015    |Contact Sensor                |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|22            |0x0016    |Root Node                     |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|23            |0x0017    |Solar Power                   |   |   |   |   |C  |C    |C          |C  |C              |
-|24            |0x0018    |Battery Storage               |   |   |   |   |C  |C    |C          |C  |C              |
-|25            |0x0019    |Secondary Network Interface   |   |   |   |   |C  |C    |C          |C  |C              |
-|34            |0x0022    |Speaker                       |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|35            |0x0023    |Casting Video Player          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|36            |0x0024    |Content App                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|39            |0x0027    |Mode Select                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|40            |0x0028    |Basic Video Player            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|41            |0x0029    |Casting Video Client          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|42            |0x002A    |Video Remote Control          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|43            |0x002B    |Fan                           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|44            |0x002C    |Air Quality Sensor            |   |   |C  |C  |C  |C    |C          |C  |C              |
-|45            |0x002D    |Air Purifier                  |   |   |C  |C  |C  |C    |C          |C  |C              |
-|64            |0x0040    |Irrigation System             |   |   |   |   |   |     |           |C  |C              |
-|65            |0x0041    |Water Freeze Detector         |   |   |   |C  |C  |C    |C          |C  |C              |
-|66            |0x0042    |Water Valve                   |   |   |   |C  |C  |C    |C          |C  |C              |
-|67            |0x0043    |Water Leak Detector           |   |   |   |C  |C  |C    |C          |C  |C              |
-|68            |0x0044    |Rain Sensor                   |   |   |   |C  |C  |C    |C          |C  |C              |
-|69            |0x0045    |Soil Sensor                   |   |   |   |   |   |     |           |C  |C              |
-|112           |0x0070    |Refrigerator                  |   |   |C  |C  |C  |C    |C          |C  |C              |
-|113           |0x0071    |Temperature Controlled Cabinet|   |   |C  |C  |C  |C    |C          |C  |C              |
-|114           |0x0072    |Room Air Conditioner          |   |   |C  |C  |C  |C    |C          |C  |C              |
-|115           |0x0073    |Laundry Washer                |   |   |C  |C  |C  |C    |C          |C  |C              |
-|116           |0x0074    |Robotic Vacuum Cleaner        |   |   |C  |C  |C  |C    |C          |C  |C              |
-|117           |0x0075    |Dishwasher                    |   |   |C  |C  |C  |C    |C          |C  |C              |
-|118           |0x0076    |Smoke CO Alarm                |   |   |C  |C  |C  |C    |C          |C  |C              |
-|119           |0x0077    |Cook Surface                  |   |   |   |C  |C  |C    |C          |C  |C              |
-|120           |0x0078    |Cooktop                       |   |   |   |C  |C  |C    |C          |C  |C              |
-|121           |0x0079    |Microwave Oven                |   |   |   |C  |C  |C    |C          |C  |C              |
-|122           |0x007A    |Extractor Hood                |   |   |   |C  |C  |C    |C          |C  |C              |
-|123           |0x007B    |Oven                          |   |   |   |C  |C  |C    |C          |C  |C              |
-|124           |0x007C    |Laundry Dryer                 |   |   |   |C  |C  |C    |C          |C  |C              |
-|144           |0x0090    |Network Infrastructure Manager|   |   |   |   |C  |C    |C          |C  |C              |
-|145           |0x0091    |Thread Border Router          |   |   |   |   |C  |C    |C          |C  |C              |
-|256           |0x0100    |On/Off Light                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|257           |0x0101    |Dimmable Light                |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|259           |0x0103    |On/Off Light Switch           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|260           |0x0104    |Dimmer Switch                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|261           |0x0105    |Color Dimmer Switch           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|262           |0x0106    |Light Sensor                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|263           |0x0107    |Occupancy Sensor              |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|266           |0x010A    |On/Off Plug-in Unit           |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|267           |0x010B    |Dimmable Plug-In Unit         |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|268           |0x010C    |Color Temperature Light       |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|269           |0x010D    |Extended Color Light          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|271           |0x010F    |Mounted On/Off Control        |   |   |   |   |C  |C    |C          |C  |C              |
-|272           |0x0110    |Mounted Dimmable Load Control |   |   |   |   |C  |C    |C          |C  |C              |
-|304           |0x0130    |Joint Fabric Administrator    |   |   |   |   |P  |P    |P          |P  |P              |
-|320           |0x0140    |Intercom                      |   |   |   |   |   |     |           |C  |C              |
-|321           |0x0141    |Audio Doorbell                |   |   |   |   |   |     |           |C  |C              |
-|322           |0x0142    |Camera                        |   |   |   |   |   |     |           |C  |C              |
-|323           |0x0143    |Video Doorbell                |   |   |   |   |   |     |           |C  |C              |
-|324           |0x0144    |Floodlight Camera             |   |   |   |   |   |     |           |C  |C              |
-|325           |0x0145    |Snapshot Camera               |   |   |   |   |   |     |           |C  |C              |
-|326           |0x0146    |Chime                         |   |   |   |   |   |     |           |C  |C              |
-|327           |0x0147    |Camera Controller             |   |   |   |   |   |     |           |C  |C              |
-|328           |0x0148    |Doorbell                      |   |   |   |   |   |     |           |C  |C              |
-|514           |0x0202    |Window Covering               |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|515           |0x0203    |Window Covering Controller    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|560           |0x0230    |Closure                       |   |   |   |   |   |     |           |C  |C              |
-|561           |0x0231    |Closure Panel                 |   |   |   |   |   |     |           |C  |C              |
-|574           |0x023E    |Closure Controller            |   |   |   |   |   |     |           |C  |C              |
-|768           |0x0300    |Heating/Cooling Unit          |C  |C  |C  |   |   |     |           |   |               |
-|769           |0x0301    |Thermostat                    |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|770           |0x0302    |Temperature Sensor            |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|771           |0x0303    |Pump                          |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|772           |0x0304    |Pump Controller               |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|773           |0x0305    |Pressure Sensor               |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|774           |0x0306    |Flow Sensor                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|775           |0x0307    |Humidity Sensor               |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|777           |0x0309    |Heat Pump                     |   |   |   |   |C  |C    |C          |C  |C              |
-|778           |0x030A    |Thermostat Controller         |   |   |   |   |   |     |C          |C  |C              |
-|1292          |0x050C    |Energy EVSE                   |   |   |   |C  |C  |C    |C          |C  |C              |
-|1293          |0x050D    |Device Energy Management      |   |   |   |C  |C  |C    |C          |C  |C              |
-|1295          |0x050F    |Water Heater                  |   |   |   |   |C  |C    |C          |C  |C              |
-|1296          |0x0510    |Electrical Sensor             |   |   |   |C  |C  |C    |C          |C  |C              |
-|1297          |0x0511    |Electrical Utility Meter      |   |   |   |   |   |     |           |C  |C              |
-|1298          |0x0512    |Meter Reference Point         |   |   |   |   |   |     |           |C  |C              |
-|1299          |0x0513    |Electrical Energy Tariff      |   |   |   |   |   |     |           |C  |C              |
-|1300          |0x0514    |Electrical Meter              |   |   |   |   |   |     |           |C  |C              |
-|2112          |0x0840    |Control Bridge                |C  |C  |C  |C  |C  |C    |C          |C  |C              |
-|2128          |0x0850    |On/Off Sensor                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |
+| ID (Decimal) | ID (hex) | Name                         |1.0|1.1|1.2|1.3|1.4|1.4.1|1.4.2-mve-1|1.5|0.9-winter-2026|0.9-summer2026|
+|--------------|----------|------------------------------|---|---|---|---|---|-----|-----------|---|---------------|--------------|
+|10            |0x000A    |Door Lock                     |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|11            |0x000B    |Door Lock Controller          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|14            |0x000E    |Aggregator                    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|15            |0x000F    |Generic Switch                |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|17            |0x0011    |Power Source                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|18            |0x0012    |OTA Requestor                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|19            |0x0013    |Bridged Node                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|20            |0x0014    |OTA Provider                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|21            |0x0015    |Contact Sensor                |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|22            |0x0016    |Root Node                     |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|23            |0x0017    |Solar Power                   |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|24            |0x0018    |Battery Storage               |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|25            |0x0019    |Secondary Network Interface   |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|34            |0x0022    |Speaker                       |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|35            |0x0023    |Casting Video Player          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|36            |0x0024    |Content App                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|39            |0x0027    |Mode Select                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|40            |0x0028    |Basic Video Player            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|41            |0x0029    |Casting Video Client          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|42            |0x002A    |Video Remote Control          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|43            |0x002B    |Fan                           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|44            |0x002C    |Air Quality Sensor            |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|45            |0x002D    |Air Purifier                  |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|64            |0x0040    |Irrigation System             |   |   |   |   |   |     |           |C  |C              |C             |
+|65            |0x0041    |Water Freeze Detector         |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|66            |0x0042    |Water Valve                   |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|67            |0x0043    |Water Leak Detector           |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|68            |0x0044    |Rain Sensor                   |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|69            |0x0045    |Soil Sensor                   |   |   |   |   |   |     |           |C  |C              |C             |
+|112           |0x0070    |Refrigerator                  |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|113           |0x0071    |Temperature Controlled Cabinet|   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|114           |0x0072    |Room Air Conditioner          |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|115           |0x0073    |Laundry Washer                |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|116           |0x0074    |Robotic Vacuum Cleaner        |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|117           |0x0075    |Dishwasher                    |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|118           |0x0076    |Smoke CO Alarm                |   |   |C  |C  |C  |C    |C          |C  |C              |C             |
+|119           |0x0077    |Cook Surface                  |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|120           |0x0078    |Cooktop                       |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|121           |0x0079    |Microwave Oven                |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|122           |0x007A    |Extractor Hood                |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|123           |0x007B    |Oven                          |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|124           |0x007C    |Laundry Dryer                 |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|144           |0x0090    |Network Infrastructure Manager|   |   |   |   |C  |C    |C          |C  |C              |C             |
+|145           |0x0091    |Thread Border Router          |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|256           |0x0100    |On/Off Light                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|257           |0x0101    |Dimmable Light                |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|259           |0x0103    |On/Off Light Switch           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|260           |0x0104    |Dimmer Switch                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|261           |0x0105    |Color Dimmer Switch           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|262           |0x0106    |Light Sensor                  |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|263           |0x0107    |Occupancy Sensor              |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|266           |0x010A    |On/Off Plug-in Unit           |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|267           |0x010B    |Dimmable Plug-In Unit         |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|268           |0x010C    |Color Temperature Light       |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|269           |0x010D    |Extended Color Light          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|271           |0x010F    |Mounted On/Off Control        |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|272           |0x0110    |Mounted Dimmable Load Control |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|304           |0x0130    |Joint Fabric Administrator    |   |   |   |   |P  |P    |P          |P  |P              |P             |
+|320           |0x0140    |Intercom                      |   |   |   |   |   |     |           |C  |C              |C             |
+|321           |0x0141    |Audio Doorbell                |   |   |   |   |   |     |           |C  |C              |C             |
+|322           |0x0142    |Camera                        |   |   |   |   |   |     |           |C  |C              |C             |
+|323           |0x0143    |Video Doorbell                |   |   |   |   |   |     |           |C  |C              |C             |
+|324           |0x0144    |Floodlight Camera             |   |   |   |   |   |     |           |C  |C              |C             |
+|325           |0x0145    |Snapshot Camera               |   |   |   |   |   |     |           |C  |C              |C             |
+|326           |0x0146    |Chime                         |   |   |   |   |   |     |           |C  |C              |C             |
+|327           |0x0147    |Camera Controller             |   |   |   |   |   |     |           |C  |C              |C             |
+|328           |0x0148    |Doorbell                      |   |   |   |   |   |     |           |C  |C              |C             |
+|336           |0x0150    |Ambient Context Sensor        |   |   |   |   |   |     |           |   |               |C             |
+|514           |0x0202    |Window Covering               |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|515           |0x0203    |Window Covering Controller    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|560           |0x0230    |Closure                       |   |   |   |   |   |     |           |C  |C              |C             |
+|561           |0x0231    |Closure Panel                 |   |   |   |   |   |     |           |C  |C              |C             |
+|574           |0x023E    |Closure Controller            |   |   |   |   |   |     |           |C  |C              |C             |
+|768           |0x0300    |Heating/Cooling Unit          |C  |C  |C  |   |   |     |           |   |               |              |
+|769           |0x0301    |Thermostat                    |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|770           |0x0302    |Temperature Sensor            |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|771           |0x0303    |Pump                          |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|772           |0x0304    |Pump Controller               |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|773           |0x0305    |Pressure Sensor               |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|774           |0x0306    |Flow Sensor                   |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|775           |0x0307    |Humidity Sensor               |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|777           |0x0309    |Heat Pump                     |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|778           |0x030A    |Thermostat Controller         |   |   |   |   |   |     |C          |C  |C              |C             |
+|1292          |0x050C    |Energy EVSE                   |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|1293          |0x050D    |Device Energy Management      |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|1295          |0x050F    |Water Heater                  |   |   |   |   |C  |C    |C          |C  |C              |C             |
+|1296          |0x0510    |Electrical Sensor             |   |   |   |C  |C  |C    |C          |C  |C              |C             |
+|1297          |0x0511    |Electrical Utility Meter      |   |   |   |   |   |     |           |C  |C              |C             |
+|1298          |0x0512    |Meter Reference Point         |   |   |   |   |   |     |           |C  |C              |C             |
+|1299          |0x0513    |Electrical Energy Tariff      |   |   |   |   |   |     |           |C  |C              |C             |
+|1300          |0x0514    |Electrical Meter              |   |   |   |   |   |     |           |C  |C              |C             |
+|2112          |0x0840    |Control Bridge                |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
+|2128          |0x0850    |On/Off Sensor                 |C  |C  |C  |C  |C  |C    |C          |C  |C              |C             |
diff --git a/docs/platforms/bouffalolab/getting_started.md b/docs/platforms/bouffalolab/getting_started.md
index 60aaeaf1a31..99b3b59e175 100644
--- a/docs/platforms/bouffalolab/getting_started.md
+++ b/docs/platforms/bouffalolab/getting_started.md
@@ -92,7 +92,7 @@ following command to list supports options.
 The output with `bouffalolab` started likes below:
 
 ```
-bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-iot-matter-v1,xt-zb6-devkit}-{light,contact-sensor}-{ethernet,wifi,thread,thread-ftd,thread-mtd}-{easyflash,littlefs}[-shell][-mfd][-rotating_device_id][-rpc][-cdc]
+bouffalolab-{bl602-night-light,bl602dk,bl616dk,bl704ldk,bl706-night-light,bl706dk}-{contact-sensor,light}-{ethernet,thread,thread-ftd,thread-mtd,wifi}-{easyflash,littlefs}[-cdc][-coredump][-memmonitor][-mfd][-mot][-rotating_device_id][-rpc][-shell]
 ```
 
 -   supported board options, select one of the following options to build
@@ -104,8 +104,6 @@ bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-
 
     -   `-bl602-night-light`
     -   `-bl706-night-light`
-    -   `-bl602-iot-matter-v1`
-    -   `-xt-zb6-devkit`
 
 -   supported example options, select one of the following options to build
 
@@ -131,8 +129,9 @@ bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-
 
     -   `-easyflash`, specifies to use `easyflash` for flash access.
 
-        > `littlefs` has different format with `easyflash`, please uses
-        > `-easyflash` for your in-field production
+        > `littlefs` uses a different format than `easyflash` and they are not
+        > compatible. Please use the `-easyflash` flag if existing in-field
+        > devices were already deployed with `easyflash`.
 
 -   `-rotating_device_id`, enable rotating device id
 
@@ -170,6 +169,15 @@ Taking lighting app with `littlefs` supported as example :
     ./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-wifi-littlefs build
     ```
 
+-   BL706 with Wi-Fi
+
+    ```
+    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
+    ```
+
+    > This BL706 + BL602 Wi-Fi solution: BL602 runs WLAN part and BL706 runs
+    > TCP/IP stack which uses SPI for communication between these two parts.
+
 -   BL616 with Thread
 
     ```
@@ -194,15 +202,12 @@ Taking lighting app with `littlefs` supported as example :
     ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
     ```
 
--   BL706 with Wi-Fi
+-   BL616 with Ethernet
 
     ```
-    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
+    ./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-ethernet-littlefs build
     ```
 
-    > This BL706 + BL602 Wi-Fi solution: BL602 runs WLAN part and BL706 runs
-    > TCP/IP stack which uses SPI for communication between these two parts.
-
 # Partition table
 
 `Bouffalo Lab` provides reference partition table files for each platform under
diff --git a/docs/platforms/nxp/nxp_se05x_guide.md b/docs/platforms/nxp/nxp_se05x_guide.md
index 968490bdd76..901d422f1f7 100644
--- a/docs/platforms/nxp/nxp_se05x_guide.md
+++ b/docs/platforms/nxp/nxp_se05x_guide.md
@@ -4,8 +4,9 @@
 -   [Supported Platforms](#supported_platforms)
 -   [SE05x Crypto Configurations](#se05x_crypto_configurations)
 -   [SE05x Type Configurations](#se05x_type_configurations)
--   [Device attestation](#device_attestation)
--   [SCP03](#scp03)
+-   [Device Attestation](#device_attestation)
+-   [SCP03 Authentication](#scp03)
+-   [Using Trust Provisioned Verifiers of SE051H for SPAKE2+](#trust_prov_verifiers_se051h)
 
 <hr>
 
@@ -13,116 +14,209 @@
 
 ## Introduction
 
-The integration of SE05x Secure Element in Matter stack can be used to offload
-required crypto operations of matter to SE05x.
+The integration of SE05x Secure Element in the Matter stack enables offloading
+of cryptographic operations to the SE05x hardware security module.
 
-The following crypto operations are supported using SE05x,
+### Supported Crypto Operations
+
+The following cryptographic operations can be offloaded to SE05x:
 
 -   Random number generation
--   EC Key Generate
--   ECDSA Sign
--   ECDSA Verify
--   HKDF
--   HMAC
--   Spake2P
+-   EC Key generation
+-   ECDSA signing
+-   ECDSA verification
+-   HKDF (HMAC-based Key Derivation Function)
+-   HMAC (Hash-based Message Authentication Code)
+-   SPAKE2+ (Password Authenticated Key Exchange)
+
+The EC key generation / ECDSA Sign for the operational key is by default
+offloaded to SE05x on enabling secure element in the build. To offload other
+crypto operations to SE05x, application / matter stack changes will be required.
 
 <a name="supported_platforms"></a>
 
 ## Supported Platforms
 
-The integration of secure element is done with the following platforms
+The SE05x secure element integration is supported on the following NXP
+platforms:
+
+### NXP i.MX 8M Mini EVK and FRDM-i.MX93
+
+Integration of SE05x with i.MX 8M Mini EVK and FRDM-i.MX93 is demonstrated using
+the thermostat example.
+
+**Prerequisites:** Refer to [i.MX 8M Mini EVK](nxp_imx8m_linux_examples.md) to
+set up the build environment.
+
+#### Hardware Connections
 
-### NXP i.MX 8M Mini EVK
+##### i.MX 8M Mini EVK with OM-SE051ARD Board
 
-Integration of SE05x with i.MX 8M Mini EVK is demonstrated using the thermostat
-example. Refer [i.MX 8M Mini EVK](nxp_imx8m_linux_examples.md) to set up the
-build environment.
+| Signal  | i.MX 8M Pin | OM-SE051ARD Pin |
+| ------- | ----------- | --------------- |
+| I2C SDA | J801_SDA    | J2_9            |
+| I2C SCL | J801_SCL    | J2_10           |
+| 3V3     | J801_VCC    | J8_4            |
+| GND     | J801_GND    | J8_7            |
 
-#### Hardware connections
+##### FRDM-i.MX93 with OM-SE051ARD Board
 
--   Connections using OM-SE051ARD board :
+| Signal            | FRDM i.MX 93 Pin        | OM-SE051ARD Pin |
+| ----------------- | ----------------------- | --------------- |
+| I2C SDA           | Pin 9 on P12 Connector  | J2_9            |
+| I2C SCL           | Pin 7 on P12 Connector  | J2_10           |
+| 3V3               | Pin 1 on P12 Connector  | J8_4            |
+| GND               | Pin 6 on P12 Connector  | J8_7            |
+| Enable (optional) | Pin 29 on P11 Connector | J1_6            |
 
-    | Signal  | i.MX 8M Pin | OM-SE051ARD Pin |
-    | ------- | ----------- | --------------- |
-    | I2C SDA | J801_SDA    | J2_9            |
-    | I2C SCL | J801_SCL    | J2_10           |
-    | 3V3     | J801_VCC    | J8_4            |
-    | GND     | J801_GND    | J8_7            |
+> **Note:** To control the secure element using the enable pin, ensure jumper
+> J14 on the OM-SE051ARD board is connected to pins 3-4. Also build the example
+> with `--args="chip_se05x_host_gpio=frdm_imx93"` to allow the FRDM-i.MX93 GPIO
+> to control the enable pin.
 
-#### Build the example as
+#### Building the Example
 
+```bash
+cd connectedhomeip
 ```
-    cd connectedhomeip
-    ./scripts/examples/imxlinux_example.sh -s examples/thermostat/nxp/linux-se05x/ -o out/thermostat -d
+
+```bash
+export IMX_SDK_ROOT=<path-to-i.MX-Yocto-SDK>
+```
+
+```bash
+./scripts/examples/imxlinux_example.sh -s examples/thermostat/nxp/linux-se05x/ -o out/thermostat -d
 ```
 
-Refer [SE05x Crypto Configurations](#se05x_crypto_configurations) sections to
-control what crypto operations to be offloaded to SE05x.
+Refer to [SE05x Crypto Configurations](#se05x_crypto_configurations) to control
+which crypto operations are offloaded to SE05x.
 
-Refer [SE05x Type Configurations](#se05x_type_configurations) sections to select
-the correct variant of secure element connected.
+Refer to [SE05x Type Configurations](#se05x_type_configurations) to select the
+correct secure element variant.
 
 ### RW61x
 
-Integration of SE05x with RW61x is demonstrated using the thermostat and all
-cluster app. Refer [RW61x](nxp_rw61x_guide.md) to set up the build environment.
+Integration of SE05x with RW61x is demonstrated using the thermostat and
+all-clusters-app examples.
+
+**Prerequisites:** Refer to [RW61x](nxp_rw61x_guide.md) to set up the build
+environment.
+
+Refer to [RW61x and SE05x](./nxp_rw61x_guide.md#se05x_secure_element_with_rw61x)
+for detailed hardware connections and build instructions.
+
+Refer to [SE05x Crypto Configurations](#se05x_crypto_configurations) to control
+which crypto operations are offloaded to SE05x.
+
+Refer to [SE05x Type Configurations](#se05x_type_configurations) to select the
+correct secure element variant.
+
+#### Building the Example
+
+**With Pre-Provisioned WiFi Credentials:**
+
+```bash
+west build -d <out_dir> -b frdmrw612 examples/thermostat/nxp/ -DCONF_FILE_NAME=prj_wifi.conf -DCONFIG_CHIP_SE05X=y
+```
+
+**Without Pre-Provisioned WiFi Credentials:**
+
+```bash
+west build -d <out_dir> -b frdmrw612 examples/thermostat/nxp/ -DCONF_FILE_NAME=prj_wifi_onnetwork.conf -DCONFIG_CHIP_SE05X=y -DCONFIG_CHIP_APP_WIFI_SSID=\"<wifi_ssid>\" -DCONFIG_CHIP_APP_WIFI_PASSWORD=\"<password>\"
+```
+
+### RT1060 EVKB
+
+Integration of SE05x with RT1060 EVKB board is demonstrated using the thermostat
+and all-clusters-app examples.
+
+**Prerequisites:** Refer to [RT1060](nxp_rt1060_guide.md) to set up the build
+environment.
 
-#### Hardware connections and Building the example with SE05x
+Refer to
+[RT1060 and SE05x](./nxp_rt1060_guide.md#se05x_secure_element_with_rt1060) for
+detailed hardware connections and build instructions.
 
-Refer [RW61x and SE05x](./nxp_rw61x_guide.md#se05x_secure_element_with_rw61x)
-for hardware connections / Building.
+Refer to [SE05x Crypto Configurations](#se05x_crypto_configurations) to control
+which crypto operations are offloaded to SE05x.
 
-Refer [SE05x Crypto Configurations](#se05x_crypto_configurations) sections to
-control what crypto operations to be offloaded to SE05x.
+Refer to [SE05x Type Configurations](#se05x_type_configurations) to select the
+correct secure element variant.
 
-Refer [SE05x Type Configurations](#se05x_type_configurations) sections to select
-the correct variant of secure element connected.
+### MCXW72
+
+Integration of SE05x with MCXW72 board is demonstrated using the lighting app
+example.
+
+**Prerequisites:** Refer to [MCXW72](nxp_mcxw72_guide.md) to set up the build
+environment.
+
+Refer to
+[MCXW72 and SE05x](./nxp_mcxw72_guide.md#se05x_secure_element_with_mcxw72) for
+detailed hardware connections and build instructions.
+
+Refer to [SE05x Crypto Configurations](#se05x_crypto_configurations) to control
+which crypto operations are offloaded to SE05x.
+
+Refer to [SE05x Type Configurations](#se05x_type_configurations) to select the
+correct secure element variant.
+
+**Note:** - It is not recommended to enable random number generation from SE05x
+when using with W72.
 
 <a name="se05x_crypto_configurations"></a>
 
 ## SE05x Crypto Configurations
 
-Following GN / cmake options can be used to enable / disable the crypto
-operations to be offloaded to SE05x
-
--   GN Options :
-
-    | GN Options                    | Description              | Type    | Default setting |
-    | ----------------------------- | ------------------------ | ------- | --------------- |
-    | chip_se05x_spake_verifier     | Spake2P Verifier on SE   | Boolean | Disabled        |
-    | chip_se05x_spake_prover       | Spake2P Prover on SE     | Boolean | Disabled        |
-    | chip_se05x_rnd_gen            | Random number generation | Boolean | Disabled        |
-    | chip_se05x_gen_ec_key         | Generate EC key in SE    | Boolean | Enabled         |
-    | chip_se05x_ecdsa_verify       | ECDSA Verify             | Boolean | Enabled         |
-    | chip_se05x_pbkdf2_sha256      | PBKDF2-SHA256            | Boolean | Disabled        |
-    | chip_se05x_hkdf_sha256        | HKDF-SHA256              | Boolean | Disabled        |
-    | chip_se05x_hmac_sha256        | HMAC-SHA256              | Boolean | Disabled        |
-    | chip_se05x_device_attestation | Device attestation       | Boolean | Disabled        |
-
-*   CMAKE Options :
-
-    | Kconfig Options                      | Description              | Default setting |
-    | ------------------------------------ | ------------------------ | --------------- |
-    | CONFIG_CHIP_SE05X_SPAKE_VERIFIER     | Spake2P Verifier on SE   | Disabled        |
-    | CONFIG_CHIP_SE05X_SPAKE_PROVER       | Spake2P Prover on SE     | Disabled        |
-    | CONFIG_CHIP_SE05X_RND_GEN            | Random number generation | Disabled        |
-    | CONFIG_CHIP_SE05X_GENERATE_EC_KEY    | Generate EC key in SE    | Enabled         |
-    | CONFIG_CHIP_SE05X_ECDSA_VERIFY       | ECDSA Verify             | Enabled         |
-    | CONFIG_CHIP_SE05X_PBKDF2_SHA256      | PBKDF2-SHA256            | Disabled        |
-    | CONFIG_CHIP_SE05X_HKDF_SHA256        | HKDF-SHA256              | Disabled        |
-    | CONFIG_CHIP_SE05X_HMAC_SHA256        | HMAC-SHA256              | Disabled        |
-    | CONFIG_CHIP_SE05X_DEVICE_ATTESTATION | Device attestation       | Disabled        |
+The following build options control which cryptographic operations are offloaded
+to SE05x:
+
+### GN Build Options
+
+| GN Option                                 | Description                            | Type    | Default |
+| ----------------------------------------- | -------------------------------------- | ------- | ------- |
+| `chip_se05x_spake_verifier`               | SPAKE2+ verifier on SE                 | Boolean | false   |
+| `chip_se05x_spake_prover`                 | SPAKE2+ prover on SE                   | Boolean | false   |
+| `chip_se05x_rnd_gen`                      | Random number generation               | Boolean | false   |
+| `chip_se05x_device_attestation`           | Device attestation                     | Boolean | false   |
+| `chip_se05x_spake_verifier_use_tp_values` | SPAKE with trust provisioned verifiers | Boolean | false   |
+| `chip_se05x_spake_verifier_tp_set_no`     | Trust provisioned passcode set number  | Integer | 1       |
+| `chip_se05x_spake_verifier_tp_iter_cnt`   | SPAKE iteration count                  | Integer | 1000    |
+
+**Example:**
+
+```bash
+gn gen out --args="chip_se05x_device_attestation=true"
+```
+
+### CMake/Kconfig Options
+
+| Kconfig Option                                   | Description                            | Default |
+| ------------------------------------------------ | -------------------------------------- | ------- |
+| `CONFIG_CHIP_SE05X_SPAKE_VERIFIER`               | SPAKE2+ verifier on SE                 | n       |
+| `CONFIG_CHIP_SE05X_SPAKE_PROVER`                 | SPAKE2+ prover on SE                   | n       |
+| `CONFIG_CHIP_SE05X_RND_GEN`                      | Random number generation               | n       |
+| `CONFIG_CHIP_SE05X_DEVICE_ATTESTATION`           | Device attestation                     | n       |
+| `CONFIG_CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES` | SPAKE with trust provisioned verifiers | n       |
+| `CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_SET_NO`     | Trust provisioned passcode set number  | 1       |
+| `CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_ITER_CNT`   | SPAKE iteration count                  | 1000    |
+
+**Example:**
+
+```bash
+west build -d <out_dir> -b <board> <example_path> -DCONFIG_CHIP_SE05X_DEVICE_ATTESTATION=y
+```
 
 <a name="se05x_type_configurations"></a>
 
 ## SE05x Type Configuration
 
-Ensure to update the SE05x feature file
-`third_party/simw-top-mini/repo/fsl_sss_ftr.h` with correct product variant.
+Configure the SE05x product variant by updating the feature file at
+`third_party/simw-top-mini/repo/fsl_sss_ftr.h`.
 
-SE050E is enabled by default.
+**Default Configuration:** SE051H is enabled by default.
 
-```
+```c
 /** Compiling without any Applet Support */
 #define SSS_HAVE_APPLET_NONE 0
 
@@ -136,51 +230,151 @@ SE050E is enabled by default.
 #define SSS_HAVE_APPLET_SE05X_C 0
 
 /** SE051 with SPAKE Support */
-#define SSS_HAVE_APPLET_SE051_H 0
+#define SSS_HAVE_APPLET_SE051_H 1
 
 /** AUTH */
 #define SSS_HAVE_APPLET_AUTH 0
 
 /** SE050E */
-#define SSS_HAVE_APPLET_SE050_E 1
+#define SSS_HAVE_APPLET_SE050_E 0
 ```
 
+Set the appropriate variant to `1` and others to `0` based on your hardware.
+
 <a name="device_attestation"></a>
 
-## Device attestation
+## Device Attestation
 
-To use SE05x for device attestation,
+To use SE05x for device attestation:
 
-1. Enable device attestation when building the example using
-   `"chip_se05x_device_attestation=true"` for GN build OR
-   `"-DCHIP_SE05X_DEVICE_ATTESTATION`" for cmake Build.
+### Step 1: Enable Device Attestation in Build
 
-2. Run the provision example (one time)
-   `third_party/simw-top-mini/repo/demos/se05x_dev_attest_key_prov/` to
-   provision the device attestation key at id - 0x7D300000 and device
-   attestation certificate at id - 0x7D300001.
+**For GN Build:**
 
+```bash
+gn gen out --args="chip_se05x_device_attestation=true"
 ```
+
+**For CMake Build:**
+
+```bash
+west build -d <out_dir> -b <board> <example_path> -DCONFIG_CHIP_SE05X_DEVICE_ATTESTATION=y
+```
+
+### Step 2: Provision Device Attestation Keys (One-Time)
+
+Run the provisioning example to store the device attestation key at ID
+`0x7FFF3007` and certificate at ID `0x7FFF3003`:
+
+```bash
 cd third_party/simw-top-mini/repo/demos/se05x_dev_attest_key_prov/linux
+```
+
+```bash
 gn gen out
+```
+
+```bash
 ninja -C out se05x_dev_attest_key_prov
+```
+
+```bash
 ./out/se05x_dev_attest_key_prov
 ```
 
-> [!IMPORTANT] The example is currently supported for i.MX 8M Mini EVK, FRDM
-> i.MX93 and RW61x. Adapt the above commands to the i.MX and RW612 build
-> commands accordingly.
+> **Important:** This example is currently supported for i.MX 8M Mini EVK,
+> FRDM-i.MX93, and RW61x. Adapt the commands to match your platform's build
+> system.
+
+**Reference:**
+[SE05x Device Attestation Example](https://github.com/NXP/plug-and-trust/blob/int/CHIPSE_Release/demos/se05x_dev_attest_key_prov/readme.md)
 
 <a name="scp03"></a>
 
-## SCP03
+## SCP03 Authentication
 
-To enable SCP03 authentication with SE05x, build the example with option
+To enable SCP03 (Secure Channel Protocol 03) authentication with SE05x:
 
-For GN Build system -
+### GN Build
 
-```
+```bash
 gn gen out --args="chip_se05x_auth=\"scp03\""
 ```
 
-Ensure to enable CMAC (MBEDTLS_CMAC_C) in mbedtls config file used.
+### CMake Build
+
+```bash
+west build -d <out_dir> -b <board> <example_path> -DCONFIG_SE05X_SCP03=y
+```
+
+> **Important:** Ensure CMAC (`MBEDTLS_CMAC_C`) is enabled in your mbedTLS
+> configuration file.
+
+<a name="trust_prov_verifiers_se051h"></a>
+
+## Using Trust Provisioned Verifiers of SE051H for SPAKE2+
+
+SE051H contains a binary file (ID: `0x7FFF2000`) with 3 sets of passcode and
+salt values:
+
+```
+[4 byte passcode #1] [16 byte salt #1]
+[4 byte passcode #2] [16 byte salt #2]
+[4 byte passcode #3] [16 byte salt #3]
+```
+
+Pre-calculated SPAKE2+ verifiers (w0 and L) for these passcodes, salts, and 5
+different iteration counts (1000, 5000, 10000, 50000, 100000) are
+trust-provisioned in SE051H.
+
+### Provision SE051H T4T Applet with QR Code
+
+Use SIMW tools to retrieve the trust-provisioned passcode and provision the
+corresponding QR code to the T4T applet.
+
+**Build the tools:**
+
+-   [SE051H Get Passcode Example](https://github.com/NXP/plug-and-trust/blob/int/CHIPSE_Release/demos/se05x_get_passcode/readme.md)
+-   [SE051H Provision Example](https://github.com/NXP/plug-and-trust/blob/int/CHIPSE_Release/demos/se051h_nfc_comm_prov/readme.md)
+
+**Execute the following commands:**
+
+```bash
+./se05x_get_passcode --tp_passcode_set_no 1
+```
+
+```bash
+./chip_tool payload generate-qrcode --setup-pin-code <PASSCODE_FROM_PREVIOUS_STEP>
+```
+
+```bash
+./se051h_nfc_comm_prov --only_t4t_provision --qrcode <QR_CODE_FROM_PREVIOUS_STEP>
+```
+
+### Build Example with Trust Provisioned Verifiers
+
+> **Note:** Refer to `platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h`
+> for additional code changes required for this integration.
+
+**GN Build:**
+
+```bash
+gn gen out --args="chip_se05x_spake_verifier=true chip_se05x_spake_verifier_use_tp_values=true chip_se05x_spake_verifier_tp_set_no=1 chip_se05x_spake_verifier_tp_iter_cnt=1000"
+```
+
+**CMake Build:**
+
+**Note:** Factory data must be provisioned first to use Trust provisioned
+values. Refer to [NXP Manufacturing Flow](nxp_manufacturing_flow.md).
+
+```bash
+west build -d <out_dir> -b <board> <example_path> -DCONF_FILE_NAME=prj_wifi_fdata.conf -DCONFIG_CHIP_SE05X_SPAKE_VERIFIER=y -DCONFIG_CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES=y -DCONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_SET_NO=1 -DCONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_ITER_CNT=1000
+```
+
+**Running the Example:**
+
+When running the example, pass the iteration count via command line:
+
+```bash
+./thermostat-app --spake2p-iterations 1000
+```
diff --git a/docs/testing/python.md b/docs/testing/python.md
index 97648971b81..0dae313f106 100644
--- a/docs/testing/python.md
+++ b/docs/testing/python.md
@@ -894,3 +894,117 @@ for that run, e.g.:
 This structured format ensures that all necessary configurations are clearly
 defined and easily understood, allowing for consistent and reliable test
 execution.
+
+# Test Module Guards
+
+Guards let you run test steps only when certain conditions are met (e.g., a
+cluster has a feature, attribute, or command).
+
+See below sections for usage examples please.
+
+## Cluster Guards
+
+The following are inherited from the `matter_testing` module, so they do not
+need to be imported. For more examples on these guards, see
+`src/python_testing/support_modules/binfo_attributes_verification.py`.
+
+Use these to skip a test step when the endpoint or cluster does not support the
+feature, attribute, or command under test.
+
+### Attribute Guard
+
+Runs the test step only if the endpoint and cluster contain the given attribute:
+
+Example:
+
+```python
+self.step(<STEP_NUMBER>)
+if await self.attribute_guard(endpoint=self.endpoint, attribute=attributes.OperationalState):
+    # If attribute exists then test step continues, else test step is skipped.
+```
+
+### Feature Guard
+
+Runs the test step only if the cluster on the endpoint supports the given
+feature:
+
+Example:
+
+```python
+self.step(<STEP_NUMBER>)
+if await self.feature_guard(endpoint=self.endpoint, cluster=Clusters.BooleanStateConfiguration, feature_int=Clusters.BooleanStateConfiguration.Bitmaps.Feature.kAudible):
+    # IF feature available then do test step, else test step is skipped.
+```
+
+### Command Guard
+
+Runs the test step only if the endpoint has the cluster that supports the given
+command:
+
+Example:
+
+```python
+self.step(<STEP_NUMBER>)
+if await self.command_guard(endpoint=self.endpoint, command=commands.Resume):
+    # If command available, then do test step here, else test step is skipped
+```
+
+## Additional Test Guards
+
+This section covers the PICS guard and the `run_if_endpoint_matches` decorator,
+with an example for each.
+
+### PICS Guard
+
+Inherited from `matter_testing` (no import needed). Runs the test step only if
+the given PICS key is enabled in the PICS file:
+
+Example:
+
+```python
+if self.pics_guard(self.check_pics(<PICS here>)):
+    self.step(<STEP_NUMBER>)
+    # Do test step logic here
+else:
+    self.skip_step(<STEP_NUMBER>)
+    #skip test step
+```
+
+### run_if_endpoint_matches decorator
+
+Import the decorator and the check functions from `matter.testing.decorators`:
+
+```python
+from matter.testing.decorators import has_feature, has_command, has_attribute, has_cluster, run_if_endpoint_matches
+```
+
+Skips the whole test if the specified endpoint does not have the required
+cluster, feature, attribute, or command. Apply the decorator above the test
+function.
+
+Examples:
+
+```python
+#Feature:
+@run_if_endpoint_matches(
+        has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
+    )
+async def test_TC_AVSM_2_2(self):
+    # Do test step logic if feature exists, else this test is skipped
+
+#Cluster
+@run_if_endpoint_matches(has_cluster(Clusters.AdministratorCommissioning))
+async def test_TC_CADMIN_1_3(self):
+    # Do test step logic if cluster exists, else this test is skipped
+
+#Attribute:
+@run_if_endpoint_matches(has_attribute(Clusters.AccessControl.Attributes.Extension))
+async def test_TC_ACL_2_3(self):
+    # Do test step logic if attribute exists, else this test is skipped
+
+#Command
+@run_if_endpoint_matches(has_command(Clusters.OperationalCredentials.Commands.SetVIDVerificationStatement))
+async def test_TC_OPCREDS_3_8(self):
+    # Do test step logic if command is available, else this test is skipped
+
+```
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
index 382d2e4f118..baaf8af0a34 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -1281,7 +1281,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1565,7 +1564,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1574,6 +1578,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1598,12 +1603,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1630,13 +1642,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2876,7 +2888,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2993,6 +3005,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3038,6 +3051,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3400,15 +3414,15 @@ endpoint 3 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 4 {
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
index 39e3dba45b1..d085fd2de64 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2037,6 +2053,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h b/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h
index f7061393d76..6be6d42a56c 100644
--- a/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h
+++ b/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 namespace chip {
@@ -30,22 +31,11 @@ class TemperatureSensorManager
 public:
     TemperatureSensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId){};
 
-    void Init()
-    {
-        Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -500);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MinMeasuredValue attribute"));
-
-        status = TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 6000);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MaxMeasuredValue attribute"));
-    }
+    void Init() { LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValueRange(mEndpointId, -500, 6000)); }
 
     void OnTemperatureChangeHandler(int16_t newValue)
     {
-        Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
+        LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValue(mEndpointId, newValue));
         ChipLogDetail(NotSpecified, "The new TemperatureMeasurement value: %d", newValue);
     }
 
diff --git a/examples/air-purifier-app/cc32xx/main/AppTask.cpp b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
index 8bc023ec08d..6673944b11d 100644
--- a/examples/air-purifier-app/cc32xx/main/AppTask.cpp
+++ b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
@@ -161,14 +161,8 @@ int AppTask::Init()
             ;
     }
 
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
-    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
-
-    // Initialize device attestation config
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     PLAT_LOG("Initialize device attestation config");
 #ifdef CC32XX_ATTESTATION_CREDENTIALS
     SetDeviceAttestationCredentialsProvider(CC32XX::GetCC32XXDacProvider());
@@ -177,6 +171,13 @@ int AppTask::Init()
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #endif
 
+    // Init ZCL Data Model and start server
+    PLAT_LOG("Initialize Server");
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
+    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
+
     // init air purifier stuff
     TEMPORARY_RETURN_IGNORED SetParentEndpointForEndpoint(AIR_QUALITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
     TEMPORARY_RETURN_IGNORED SetParentEndpointForEndpoint(TEMPERATURE_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
index 3b07b1143ca..13208f36dad 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1768,7 +1767,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1777,6 +1781,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1801,12 +1806,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1833,13 +1845,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2463,7 +2475,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2591,6 +2603,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2766,6 +2779,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2816,14 +2830,14 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster RelativeHumidityMeasurement {
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
index 7500cb15adb..cadddd1440b 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1733,6 +1733,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4073,6 +4089,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter
index 885953899a0..7b9c071f27f 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1768,7 +1767,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1777,6 +1781,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1801,12 +1806,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1833,13 +1845,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2560,7 +2572,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2670,6 +2682,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2836,6 +2849,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2905,14 +2919,14 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster RelativeHumidityMeasurement {
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.zap
index e67e781c6f1..db7a0db7f83 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.zap
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1452,6 +1452,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3648,6 +3664,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/include/temperature-sensor-manager.h b/examples/air-quality-sensor-app/air-quality-sensor-common/include/temperature-sensor-manager.h
index 37f26e1412a..803ad2b20d4 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/include/temperature-sensor-manager.h
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/include/temperature-sensor-manager.h
@@ -1,7 +1,7 @@
 
 #pragma once
 #include <app-common/zap-generated/attributes/Accessors.h>
-
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 namespace chip {
@@ -13,20 +13,12 @@ class TemperatureSensorManager
 public:
     TemperatureSensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId)
     {
-        Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -5);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MinMeasuredValue attribute"));
-
-        status = TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 60);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MaxMeasuredValue attribute"));
+        LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValueRange(mEndpointId, -5, 60));
     };
 
     void OnTemperatureChangeHandler(int16_t newValue)
     {
-        Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
-        VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
-                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
+        LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValue(mEndpointId, newValue));
         ChipLogDetail(NotSpecified, "The new TemperatureMeasurement value: %d", newValue);
     }
 
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 386f23a5d4e..a0fed3b80c7 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2102,7 +2102,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2908,7 +2907,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2917,6 +2921,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2941,12 +2946,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2973,13 +2985,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3622,7 +3634,7 @@ cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 cluster SmokeCoAlarm = 92 {
-  revision 1;
+  revision 2;
 
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
@@ -3652,6 +3664,7 @@ cluster SmokeCoAlarm = 92 {
     kEndOfService = 6;
     kInterconnectSmoke = 7;
     kInterconnectCO = 8;
+    kInoperative = 9;
   }
 
   enum MuteStateEnum : enum8 {
@@ -3721,6 +3734,7 @@ cluster SmokeCoAlarm = 92 {
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
   attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
+  provisional readonly attribute optional boolean unmounted = 13;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -7092,7 +7106,7 @@ internal cluster FaultInjection = 4294048774 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -7315,7 +7329,7 @@ endpoint 0 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    callback attribute featureMap default = 2;
+    callback attribute featureMap;
     callback attribute clusterRevision;
 
     handle command TestEventTrigger;
@@ -7520,6 +7534,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -7565,7 +7580,7 @@ endpoint 0 {
 }
 endpoint 1 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
   binding cluster OnOff;
 
@@ -7916,6 +7931,7 @@ endpoint 1 {
     ram      attribute contaminationState default = 0;
     ram      attribute smokeSensitivityLevel default = 1;
     ram      attribute expiryDate default = 0;
+    ram      attribute unmounted default = 0;
     ram      attribute featureMap default = 3;
     ram      attribute clusterRevision default = 1;
 
@@ -8180,6 +8196,8 @@ endpoint 1 {
     ram      attribute minSetpointDeadBand default = 0x19;
     ram      attribute controlSequenceOfOperation default = 0x04;
     ram      attribute systemMode default = 0x01;
+    ram      attribute temperatureSetpointHold default = 0;
+    ram      attribute temperatureSetpointHoldDuration;
     callback attribute presetTypes;
     callback attribute scheduleTypes;
     ram      attribute numberOfPresets default = 0;
@@ -8339,12 +8357,12 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
@@ -8769,7 +8787,7 @@ endpoint 1 {
 }
 endpoint 2 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index b7c529106a2..a82458b2532 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2866,7 +2866,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5547,6 +5547,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -5973,7 +5989,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
@@ -9949,6 +9965,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "Unmounted",
+              "code": 13,
+              "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": "FeatureMap",
               "code": 65532,
@@ -13405,6 +13437,38 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "TemperatureSetpointHold",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TemperatureSetpointHoldEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TemperatureSetpointHoldDuration",
+              "code": 36,
+              "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": "PresetTypes",
               "code": 72,
@@ -21258,7 +21322,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
diff --git a/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp b/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp
index 3ea24919eaf..8cdcf58433a 100644
--- a/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp
@@ -116,8 +116,8 @@ static void BoundDeviceContextReleaseHandler(void * context)
 static void InitBindingHandlerInternal(intptr_t arg)
 {
     auto & server = chip::Server::GetInstance();
-    TEMPORARY_RETURN_IGNORED Binding::Manager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    LogErrorOnFailure(Binding::Manager::GetInstance().Init(
+        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() }));
     Binding::Manager::GetInstance().RegisterBoundDeviceChangedHandler(BoundDeviceChangedHandler);
     Binding::Manager::GetInstance().RegisterBoundDeviceContextReleaseHandler(BoundDeviceContextReleaseHandler);
 }
diff --git a/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp
index 1690ee3caac..83e5db5aad5 100644
--- a/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp
@@ -31,9 +31,9 @@ constexpr const uint16_t kSelfTestingTimeoutSec = 10;
 } // namespace
 
 static std::array<ExpressedStateEnum, SmokeCoAlarmServer::kPriorityOrderLength> sPriorityOrder = {
-    ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke, ExpressedStateEnum::kCOAlarm,
-    ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,     ExpressedStateEnum::kTesting,
-    ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
+    ExpressedStateEnum::kInoperative, ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke,
+    ExpressedStateEnum::kCOAlarm,     ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,
+    ExpressedStateEnum::kTesting,     ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
 };
 
 void EndSelfTestingEventHandler(System::Layer * systemLayer, void * appState)
@@ -175,6 +175,16 @@ bool HandleSmokeCOTestEventTrigger(uint64_t eventTrigger)
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Smoke Sensitivity");
         SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kStandard);
         break;
+    case SmokeCOTrigger::kForceUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(1, true), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(1, false), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
     default:
 
         return false;
diff --git a/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp b/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
index 027bb055cca..657216d02e5 100644
--- a/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
+++ b/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
@@ -24,9 +24,9 @@ using namespace chip::app::Clusters::SmokeCoAlarm;
 using namespace chip::DeviceLayer;
 
 static std::array<ExpressedStateEnum, SmokeCoAlarmServer::kPriorityOrderLength> sPriorityOrder = {
-    ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke, ExpressedStateEnum::kCOAlarm,
-    ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,     ExpressedStateEnum::kTesting,
-    ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
+    ExpressedStateEnum::kInoperative, ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke,
+    ExpressedStateEnum::kCOAlarm,     ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,
+    ExpressedStateEnum::kTesting,     ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
 };
 
 CHIP_ERROR SmokeCoAlarmManager::Init()
@@ -162,6 +162,16 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Smoke Sensitivity");
         SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kStandard);
         break;
+    case SmokeCOTrigger::kForceUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(1, true), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(1, false), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
     default:
 
         return false;
diff --git a/examples/all-clusters-app/asr/src/AppTask.cpp b/examples/all-clusters-app/asr/src/AppTask.cpp
index a264b4e3832..861becb59b9 100644
--- a/examples/all-clusters-app/asr/src/AppTask.cpp
+++ b/examples/all-clusters-app/asr/src/AppTask.cpp
@@ -30,6 +30,7 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
@@ -181,14 +182,14 @@ void AppTask::AppEventHandler(AppEvent * aEvent)
     switch (aEvent->Type)
     {
     case AppEvent::kEventType_Timer: {
-        chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(
-            /* endpoint ID */ 1, /* temperature in 0.01*C */ int16_t(temperature));
+        LogErrorOnFailure(chip::app::Clusters::TemperatureMeasurement::SetMeasuredValue(/* endpoint ID */ 1,
+                                                                                        /* temperature in 0.01*C */ temperature));
 
         chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(
-            /* endpoint ID */ 1, /* humidity in 0.01% */ int16_t(humidity));
+            /* endpoint ID */ 1, /* humidity in 0.01% */ humidity);
 
         chip::app::Clusters::PressureMeasurement::Attributes::MeasuredValue::Set(
-            /* endpoint ID */ 1, /* pressure in 0.01 */ int16_t(pressure));
+            /* endpoint ID */ 1, /* pressure in 0.01 */ pressure);
 
         break;
     }
diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
index f9d77f1c27e..1a4be93de21 100644
--- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
@@ -27,6 +27,7 @@
 #include <app/clusters/boolean-state-server/CodegenIntegration.h>
 #include <app/clusters/illuminance-measurement-server/CodegenIntegration.h>
 #include <app/clusters/occupancy-sensor-server/CodegenIntegration.h>
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 
 #include <string>
 #include <tuple>
@@ -196,7 +197,7 @@ class EditAttributeListModel : public TouchesMatterStackModel
             if (name == "Temperature")
             {
                 // update the temp attribute here for hardcoded endpoint 1
-                chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n * 100));
+                LogErrorOnFailure(app::Clusters::TemperatureMeasurement::SetMeasuredValue(1, static_cast<int16_t>(n * 100)));
             }
             else if (name == "Color Current Level")
             {
@@ -219,18 +220,14 @@ class EditAttributeListModel : public TouchesMatterStackModel
             else if (name == "Illuminance")
             {
                 // update the current illuminance here for hardcoded endpoint 1
-                auto illuminanceMeasurement = app::Clusters::IlluminanceMeasurement::FindClusterOnEndpoint(1);
-                if (illuminanceMeasurement != nullptr)
+                CHIP_ERROR err = app::Clusters::IlluminanceMeasurement::SetMeasuredValue(1, static_cast<uint16_t>(n));
+                if (err == CHIP_NO_ERROR)
                 {
-                    CHIP_ERROR err = illuminanceMeasurement->SetMeasuredValue(static_cast<int16_t>(n));
-                    if (err == CHIP_NO_ERROR)
-                    {
-                        ESP_LOGI(TAG, "Illuminance changed to : %d", n);
-                    }
-                    else
-                    {
-                        ESP_LOGE(TAG, "Failed to set illuminance: %" CHIP_ERROR_FORMAT, err.Format());
-                    }
+                    ESP_LOGI(TAG, "Illuminance changed to : %d", n);
+                }
+                else
+                {
+                    ESP_LOGE(TAG, "Failed to set illuminance: %" CHIP_ERROR_FORMAT, err.Format());
                 }
             }
             else if (name == "Humidity")
@@ -667,8 +664,8 @@ void SetupPretendDevices()
     AddEndpoint("External");
     AddCluster("Thermometer");
     AddAttribute("Temperature", "21");
-    // write the temp attribute
-    chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(21 * 100));
+
+    LogErrorOnFailure(app::Clusters::TemperatureMeasurement::SetMeasuredValue(1, static_cast<int16_t>(21 * 100)));
 
     AddDevice("Garage 1");
     AddEndpoint("Door 1");
@@ -712,7 +709,6 @@ void SetupPretendDevices()
     AddDevice("Thermostat");
     AddEndpoint("1");
     AddCluster("Thermostat");
-    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(21 * 100));
     app::Clusters::Thermostat::Attributes::LocalTemperature::Set(1, static_cast<int16_t>(21 * 100));
     AddAttribute("SystemMode", "4");
     app::Clusters::Thermostat::Attributes::SystemMode::Set(1, chip::app::Clusters::Thermostat::SystemModeEnum::kHeat);
@@ -736,11 +732,7 @@ void SetupPretendDevices()
     AddCluster("Illuminance Measurement");
     AddAttribute("Illuminance", "1000");
 
-    auto illuminanceMeasurement = app::Clusters::IlluminanceMeasurement::FindClusterOnEndpoint(1);
-    if (illuminanceMeasurement != nullptr)
-    {
-        LogErrorOnFailure(illuminanceMeasurement->SetMeasuredValue(static_cast<int16_t>(1000)));
-    }
+    LogErrorOnFailure(app::Clusters::IlluminanceMeasurement::SetMeasuredValue(1, static_cast<uint16_t>(1000)));
 
     AddDevice("Color Light");
     AddEndpoint("1");
diff --git a/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h b/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
index 45ca2959e20..9c74b115d25 100644
--- a/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
@@ -109,6 +109,11 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 // Enable `Extension` attribute of ACL Cluster
 #ifndef CHIP_CONFIG_ENABLE_ACL_EXTENSIONS
 #define CHIP_CONFIG_ENABLE_ACL_EXTENSIONS 1
diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
index e0844ab7f3c..3be00567b4e 100644
--- a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
@@ -127,6 +127,10 @@ void NetWorkCommissioningInstInit()
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -139,8 +143,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index d233b9f718e..657c88ed6cb 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -20,6 +20,8 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/EventLogging.h>
+#include <app/clusters/basic-information/CodegenIntegration.h>
+#include <app/clusters/boolean-state-configuration-server/CodegenIntegration.h>
 #include <app/clusters/boolean-state-server/CodegenIntegration.h>
 #include <app/clusters/general-diagnostics-server/CodegenIntegration.h>
 #include <app/clusters/occupancy-sensor-server/CodegenIntegration.h>
@@ -546,13 +548,14 @@ void AllClustersAppCommandHandler::HandleCommand(intptr_t context)
     }
     else if (name == "SimulateConfigurationVersionChange")
     {
-        uint32_t configurationVersion = 0;
-        TEMPORARY_RETURN_IGNORED ConfigurationMgr().GetConfigurationVersion(configurationVersion);
-        configurationVersion++;
-
-        if (ConfigurationMgr().StoreConfigurationVersion(configurationVersion + 1) != CHIP_NO_ERROR)
+        Clusters::BasicInformationCluster * cluster = Clusters::BasicInformation::GetClusterInstance();
+        if (cluster == nullptr)
+        {
+            ChipLogError(NotSpecified, "No basic information cluster available. Invalid state.");
+        }
+        else
         {
-            ChipLogError(NotSpecified, "Failed to store configuration version:%d", configurationVersion);
+            LogErrorOnFailure(cluster->IncreaseConfigurationVersion());
         }
     }
     else if (name == "SetSimulatedSoilMoisture")
@@ -606,6 +609,38 @@ void AllClustersAppCommandHandler::HandleCommand(intptr_t context)
 
         self->OnBooleanStateChangeHandler(endpointId, newState);
     }
+    else if (name == "SetBooleanStateSensorFault")
+    {
+        bool hasEndpointId  = HasNumericField(self->mJsonValue, "EndpointId");
+        bool hasSensorFault = HasNumericField(self->mJsonValue, "SensorFault");
+
+        if (!hasEndpointId || !hasSensorFault)
+        {
+            std::string inputJson = self->mJsonValue.toStyledString();
+            ChipLogError(NotSpecified, "Missing or invalid value for EndpointId or SensorFault in %s", inputJson.c_str());
+            return;
+        }
+
+        auto endpointId  = static_cast<chip::EndpointId>(self->mJsonValue["EndpointId"].asUInt());
+        auto sensorFault = static_cast<uint16_t>(self->mJsonValue["SensorFault"].asUInt());
+
+        self->OnBooleanStateSensorFaultHandler(endpointId, sensorFault);
+    }
+    else if (name == "SetUnmounted")
+    {
+        uint8_t unmounted   = static_cast<uint8_t>(self->mJsonValue["Unmounted"].asUInt());
+        EndpointId endpoint = static_cast<EndpointId>(self->mJsonValue["EndpointId"].asUInt());
+        SmokeCoAlarmServer::Instance().SetInoperativeWhenUnmounted(true);
+        if (1 == unmounted || 0 == unmounted)
+        {
+            VerifyOrReturn(SmokeCoAlarmServer::Instance().SetUnmountedState(endpoint, static_cast<bool>(unmounted)),
+                           ChipLogError(NotSpecified, "Error setting unmounted state."));
+        }
+        else
+        {
+            ChipLogError(NotSpecified, "Invalid Unmounted state to set.");
+        }
+    }
     else
     {
         ChipLogError(NotSpecified, "Unhandled command '%s': this should never happen", name.c_str());
@@ -1027,6 +1062,18 @@ void AllClustersAppCommandHandler::OnBooleanStateChangeHandler(chip::EndpointId
     }
 }
 
+void AllClustersAppCommandHandler::OnBooleanStateSensorFaultHandler(chip::EndpointId endpointId, uint16_t sensorFault)
+{
+    BitMask<BooleanStateConfiguration::SensorFaultBitmap> fault(sensorFault);
+    CHIP_ERROR err = BooleanStateConfiguration::EmitSensorFault(endpointId, fault);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to emit SensorFault on endpoint %d: %" CHIP_ERROR_FORMAT, endpointId, err.Format());
+        return;
+    }
+    ChipLogProgress(NotSpecified, "SensorFault set to 0x%04x on endpoint %d", sensorFault, endpointId);
+}
+
 void AllClustersCommandDelegate::OnEventCommandReceived(const char * json)
 {
     auto handler = AllClustersAppCommandHandler::FromJSON(json);
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.h b/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
index c0f1377ed1a..b048677f234 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
@@ -135,6 +135,11 @@ class AllClustersAppCommandHandler
      * Should be called when it is necessary to change the BooleanState cluster StateValue attribute.
      */
     void OnBooleanStateChangeHandler(chip::EndpointId endpointId, bool newState);
+
+    /**
+     * Should be called when it is necessary to trigger or clear a sensor fault on the BooleanStateConfiguration cluster.
+     */
+    void OnBooleanStateSensorFaultHandler(chip::EndpointId endpointId, uint16_t sensorFault);
 };
 
 class AllClustersCommandDelegate : public NamedPipeCommandDelegate
diff --git a/examples/all-clusters-app/linux/AppOptions.cpp b/examples/all-clusters-app/linux/AppOptions.cpp
index b1c616771d2..63102668f5c 100644
--- a/examples/all-clusters-app/linux/AppOptions.cpp
+++ b/examples/all-clusters-app/linux/AppOptions.cpp
@@ -65,7 +65,7 @@ struct MockClock : public ClockBase
     }
 
 public:
-    MockClock() : mRealClock(SystemClock()) { Clock::Internal::SetSystemClockForTesting(this); }
+    MockClock() : mRealClock(SystemClock()), mOffset(Clock::kZero) { Clock::Internal::SetSystemClockForTesting(this); }
     ~MockClock() { Clock::Internal::SetSystemClockForTesting(&mRealClock); }
 
     void SetUTCTime(Microseconds64 aOverride) { TEMPORARY_RETURN_IGNORED GetOffsetFrom(mRealClock, aOverride, mOffset); }
diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
index 76b404c0198..1b7bdd16856 100644
--- a/examples/all-clusters-app/linux/BUILD.gn
+++ b/examples/all-clusters-app/linux/BUILD.gn
@@ -77,6 +77,7 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/app:attribute-persistence",
+    "${chip_root}/src/app/clusters/groupcast",
     "${chip_root}/src/app/clusters/identify-server",
     "${chip_root}/src/app/clusters/software-diagnostics-server:software-fault-listener",
     "${chip_root}/src/app/clusters/valve-configuration-and-control-server:valve-configuration-and-control-server",
diff --git a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
index 77bc3eb0425..cb727c89fe9 100644
--- a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
+++ b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
@@ -39,6 +39,11 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 // Allows app options (ports) to be configured on launch of app
 #define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
 
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
index 5125a7f3d1d..e7a22f07153 100644
--- a/examples/all-clusters-app/linux/main-common.cpp
+++ b/examples/all-clusters-app/linux/main-common.cpp
@@ -43,6 +43,7 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
 #include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
+#include <app/clusters/groupcast/GroupcastCluster.h>
 #include <app/clusters/identify-server/IdentifyCluster.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h>
@@ -177,6 +178,8 @@ RegisteredServerCluster<Clusters::IdentifyCluster>
                           .WithIdentifyType(Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator)
                           .WithDelegate(&sIdentifyDelegate));
 
+LazyRegisteredServerCluster<Clusters::GroupcastCluster> gGroupcastCluster;
+
 } // namespace
 
 #ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
@@ -214,6 +217,17 @@ void ApplicationInit()
     VerifyOrDie(CodegenDataModelProvider::Instance().Registry().Register(gIdentifyCluster3.Registration()) == CHIP_NO_ERROR);
     VerifyOrDie(CodegenDataModelProvider::Instance().Registry().Register(gIdentifyCluster4.Registration()) == CHIP_NO_ERROR);
 
+    gGroupcastCluster.Create(
+        Clusters::GroupcastContext{
+            .fabricTable       = Server::GetInstance().GetFabricTable(),
+            .groupDataProvider = *Credentials::GetGroupDataProvider(),
+            .timerDelegate     = sTimerDelegate,
+        },
+        BitFlags<Clusters::Groupcast::Feature>(Clusters::Groupcast::Feature::kListener, Clusters::Groupcast::Feature::kSender,
+                                               Clusters::Groupcast::Feature::kPerGroup));
+
+    VerifyOrDie(CodegenDataModelProvider::Instance().Registry().Register(gGroupcastCluster.Registration()) == CHIP_NO_ERROR);
+
     TEMPORARY_RETURN_IGNORED SetTagList(/* endpoint= */ 0,
                                         Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp0TagList));
     TEMPORARY_RETURN_IGNORED SetTagList(/* endpoint= */ 1,
diff --git a/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
index 058e2f2ceae..23a72770975 100644
--- a/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -30,4 +30,9 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 #define CHIP_CONFIG_ENABLE_ACL_EXTENSIONS 1
diff --git a/examples/all-clusters-app/nxp/zephyr/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/nxp/zephyr/main/include/CHIPProjectConfig.h
index ac0493e59bd..2c577abb93c 100644
--- a/examples/all-clusters-app/nxp/zephyr/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/nxp/zephyr/main/include/CHIPProjectConfig.h
@@ -30,4 +30,9 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 #define CHIP_CONFIG_ENABLE_ACL_EXTENSIONS 1
diff --git a/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter b/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter
index 5de0aca3f91..4109bb8ac9d 100644
--- a/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter
+++ b/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter
@@ -2102,7 +2102,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2908,7 +2907,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2917,6 +2921,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2941,12 +2946,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2973,13 +2985,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3719,7 +3731,7 @@ cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 cluster SmokeCoAlarm = 92 {
-  revision 1;
+  revision 2;
 
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
@@ -3749,6 +3761,7 @@ cluster SmokeCoAlarm = 92 {
     kEndOfService = 6;
     kInterconnectSmoke = 7;
     kInterconnectCO = 8;
+    kInoperative = 9;
   }
 
   enum MuteStateEnum : enum8 {
@@ -3818,6 +3831,7 @@ cluster SmokeCoAlarm = 92 {
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
   attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
+  provisional readonly attribute optional boolean unmounted = 13;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -7827,7 +7841,7 @@ internal cluster FaultInjection = 4294048774 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -8042,6 +8056,7 @@ endpoint 0 {
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -8250,6 +8265,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -8308,7 +8324,7 @@ endpoint 0 {
 }
 endpoint 1 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
   binding cluster OnOff;
 
@@ -8646,6 +8662,7 @@ endpoint 1 {
     ram      attribute contaminationState default = 0;
     ram      attribute smokeSensitivityLevel default = 1;
     ram      attribute expiryDate default = 0;
+    ram      attribute unmounted default = 0;
     ram      attribute featureMap default = 3;
     ram      attribute clusterRevision default = 1;
 
@@ -9244,12 +9261,12 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
@@ -9614,7 +9631,7 @@ endpoint 1 {
 }
 endpoint 2 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
diff --git a/examples/all-clusters-app/realtek/data_model/all-clusters-app.zap b/examples/all-clusters-app/realtek/data_model/all-clusters-app.zap
index bcff72d9c22..136f1d0c4f3 100644
--- a/examples/all-clusters-app/realtek/data_model/all-clusters-app.zap
+++ b/examples/all-clusters-app/realtek/data_model/all-clusters-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2728,6 +2728,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -5467,6 +5483,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -6063,7 +6095,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
@@ -9941,6 +9973,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "Unmounted",
+              "code": 13,
+              "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": "FeatureMap",
               "code": 65532,
@@ -22671,7 +22719,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
diff --git a/examples/all-clusters-app/telink/include/CHIPProjectConfig.h b/examples/all-clusters-app/telink/include/CHIPProjectConfig.h
index 71241bc29c1..b6e5a1e6d58 100644
--- a/examples/all-clusters-app/telink/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/telink/include/CHIPProjectConfig.h
@@ -35,4 +35,9 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 #define CHIP_CONFIG_ENABLE_ACL_EXTENSIONS 1
diff --git a/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
index 3d67773217a..6a86a78c9b9 100644
--- a/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
+++ b/examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h
@@ -34,6 +34,11 @@
 // CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
 
+// Temporary set MaxMembershipCount to 24 for all-cluster-app due to hardcoded TestGroupKeyManagementCluster.yaml
+// Where 12 group are created on a single fabric with the group clusters.
+// TODO cleanup this config #43166
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 24
+
 // Claim a device type while advertising that matches the device type on our
 // endpoint 1.  0x0101 is the "Dimmable Light" device type.
 #define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x0101
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 19f13e4e740..b822e9538dc 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2019,7 +2019,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2678,7 +2677,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2687,6 +2691,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2711,12 +2716,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2743,13 +2755,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -6465,7 +6477,7 @@ internal cluster UnitTesting = 4294048773 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -6648,6 +6660,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -6756,6 +6769,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -6790,7 +6804,7 @@ endpoint 0 {
 }
 endpoint 1 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
@@ -7074,11 +7088,11 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
@@ -7331,7 +7345,7 @@ endpoint 1 {
 }
 endpoint 2 {
   device type ma_powersource = 17, version 1;
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index 9dd18842d3c..2cf30f1f17e 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2337,6 +2337,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3679,6 +3695,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -3996,7 +4028,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
@@ -10273,7 +10305,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
index 89e632a71c6..86dc793edc7 100644
--- a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/boolean-state-server/CodegenIntegration.h>
 #include <app/clusters/illuminance-measurement-server/CodegenIntegration.h>
 #include <app/clusters/occupancy-sensor-server/CodegenIntegration.h>
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 
 #include <string>
 #include <tuple>
@@ -161,7 +162,7 @@ class EditAttributeListModel : public TouchesMatterStackModel
             if (name == "Temperature")
             {
                 // update the temp attribute here for hardcoded endpoint 1
-                chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n * 100));
+                LogErrorOnFailure(chip::app::Clusters::TemperatureMeasurement::SetMeasuredValue(1, static_cast<int16_t>(n * 100)));
             }
             else if (name == "Color Current Level")
             {
@@ -184,18 +185,14 @@ class EditAttributeListModel : public TouchesMatterStackModel
             else if (name == "Illuminance")
             {
                 // update the current illuminance here for hardcoded endpoint 1
-                auto illuminanceMeasurement = app::Clusters::IlluminanceMeasurement::FindClusterOnEndpoint(1);
-                if (illuminanceMeasurement != nullptr)
+                CHIP_ERROR err = app::Clusters::IlluminanceMeasurement::SetMeasuredValue(1, static_cast<uint16_t>(n));
+                if (err == CHIP_NO_ERROR)
                 {
-                    CHIP_ERROR err = illuminanceMeasurement->SetMeasuredValue(static_cast<int16_t>(n));
-                    if (err == CHIP_NO_ERROR)
-                    {
-                        ESP_LOGI(TAG, "Illuminance changed to : %d", n);
-                    }
-                    else
-                    {
-                        ESP_LOGE(TAG, "Failed to set illuminance: %" CHIP_ERROR_FORMAT, err.Format());
-                    }
+                    ESP_LOGI(TAG, "Illuminance changed to : %d", n);
+                }
+                else
+                {
+                    ESP_LOGE(TAG, "Failed to set illuminance: %" CHIP_ERROR_FORMAT, err.Format());
                 }
             }
             else if (name == "Humidity")
@@ -525,8 +522,8 @@ void SetupPretendDevices()
     AddEndpoint("External");
     AddCluster("Thermometer");
     AddAttribute("Temperature", "21");
-    // write the temp attribute
-    chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(21 * 100));
+
+    LogErrorOnFailure(chip::app::Clusters::TemperatureMeasurement::SetMeasuredValue(1, static_cast<int16_t>(21 * 100)));
 
     AddDevice("Door Lock");
     AddEndpoint("Default");
@@ -578,7 +575,6 @@ void SetupPretendDevices()
     AddDevice("Thermostat");
     AddEndpoint("1");
     AddCluster("Thermostat");
-    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(21 * 100));
     app::Clusters::Thermostat::Attributes::LocalTemperature::Set(1, static_cast<int16_t>(21 * 100));
     AddAttribute("SystemMode", "4");
     app::Clusters::Thermostat::Attributes::SystemMode::Set(1, app::Clusters::Thermostat::SystemModeEnum::kHeat);
@@ -598,11 +594,7 @@ void SetupPretendDevices()
     AddCluster("Illuminance Measurement");
     AddAttribute("Illuminance", "1000");
 
-    auto illuminanceMeasurement = app::Clusters::IlluminanceMeasurement::FindClusterOnEndpoint(1);
-    if (illuminanceMeasurement != nullptr)
-    {
-        LogErrorOnFailure(illuminanceMeasurement->SetMeasuredValue(static_cast<int16_t>(1000)));
-    }
+    LogErrorOnFailure(app::Clusters::IlluminanceMeasurement::SetMeasuredValue(1, static_cast<uint16_t>(1000)));
 
     AddDevice("Color Light");
     AddEndpoint("1");
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 98a860f15f4..a3feff098ef 100644
--- a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
@@ -125,6 +125,10 @@ void NetWorkCommissioningInstInit()
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -137,8 +141,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif
diff --git a/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.cpp b/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.cpp
index a2e514c19db..df99933b09d 100644
--- a/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.cpp
@@ -34,7 +34,7 @@ CHIP_ERROR BooleanStateSensorDevice::Register(chip::EndpointId endpoint, CodeDri
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void BooleanStateSensorDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void BooleanStateSensorDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
     if (mBooleanStateCluster.IsConstructed())
diff --git a/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.h b/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.h
index e42110304ad..f1f713d4ff8 100644
--- a/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/boolean-state-sensor/BooleanStateSensorDevice.h
@@ -40,7 +40,7 @@ class BooleanStateSensorDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
     Clusters::BooleanStateCluster & BooleanState() { return mBooleanStateCluster.Cluster(); }
 
diff --git a/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.cpp b/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.cpp
index 1851e17fb6e..635a2f955cc 100644
--- a/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.cpp
@@ -46,7 +46,7 @@ CHIP_ERROR ChimeDevice::Register(chip::EndpointId endpoint, CodeDrivenDataModelP
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void ChimeDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void ChimeDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
     if (mChimeCluster.IsConstructed())
diff --git a/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.h b/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.h
index ee499a1d255..548cc98c214 100644
--- a/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/chime/ChimeDevice.h
@@ -33,7 +33,7 @@ class ChimeDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
     Clusters::ChimeCluster & ChimeCluster();
 
diff --git a/examples/all-devices-app/all-devices-common/devices/interface/DeviceInterface.h b/examples/all-devices-app/all-devices-common/devices/interface/DeviceInterface.h
index 421fb696b70..597193f4f6c 100644
--- a/examples/all-devices-app/all-devices-common/devices/interface/DeviceInterface.h
+++ b/examples/all-devices-app/all-devices-common/devices/interface/DeviceInterface.h
@@ -42,8 +42,8 @@ class DeviceInterface : public EndpointInterface
     /// Removes a device's clusters from the given provider. This
     /// must only be called when register has succeeded before. Expected
     /// usage of this function is for when the device is no longer needed
-    /// (for example, on shutown), to destory the device's clusters.
-    virtual void UnRegister(CodeDrivenDataModelProvider & provider) = 0;
+    /// (for example, on shutdown), to destroy the device's clusters.
+    virtual void Unregister(CodeDrivenDataModelProvider & provider) = 0;
 
     // Endpoint interface implementation
     CHIP_ERROR DeviceTypes(ReadOnlyBufferBuilder<DataModel::DeviceTypeEntry> & out) const override;
diff --git a/examples/all-devices-app/all-devices-common/devices/interface/SingleEndpointDevice.h b/examples/all-devices-app/all-devices-common/devices/interface/SingleEndpointDevice.h
index 1492d97e589..f179421442c 100644
--- a/examples/all-devices-app/all-devices-common/devices/interface/SingleEndpointDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/interface/SingleEndpointDevice.h
@@ -51,8 +51,8 @@ class SingleEndpointDevice : public DeviceInterface
     CHIP_ERROR SingleEndpointRegistration(EndpointId endpoint, CodeDrivenDataModelProvider & provider, EndpointId parentId);
 
     /// Internal function to unregister a single endpoint device. This will destroy the clusters part of
-    /// this class, and must be called in a subclass' device-specific UnRegister() function. This allows
-    /// for the destruction of the general SingleEndpointDevice clusters and device-specifc clusters from
+    /// this class, and must be called in a subclass' device-specific Unregister() function. This allows
+    /// for the destruction of the general SingleEndpointDevice clusters and device-specific clusters from
     /// the subclass, as well as removal of the device endpoint from the provider to happen together.
     void SingleEndpointUnregistration(CodeDrivenDataModelProvider & provider);
 
diff --git a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.cpp b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.cpp
index fd21d72afcf..55805987781 100644
--- a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.cpp
@@ -46,7 +46,7 @@ CHIP_ERROR OccupancySensorDevice::Register(chip::EndpointId endpoint, CodeDriven
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void OccupancySensorDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void OccupancySensorDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
     if (mOccupancySensingCluster.IsConstructed())
diff --git a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.h b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.h
index c12af9a140c..a172df5da4b 100644
--- a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/OccupancySensorDevice.h
@@ -34,7 +34,7 @@ class OccupancySensorDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
     Clusters::OccupancySensingCluster & OccupancySensingCluster() { return mOccupancySensingCluster.Cluster(); }
 
diff --git a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.cpp b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.cpp
index e551b399f14..7821d7a5b50 100644
--- a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.cpp
@@ -58,10 +58,10 @@ CHIP_ERROR TogglingOccupancySensorDevice::Register(EndpointId endpoint, CodeDriv
     return mTimerDelegate.StartTimer(this, kOccupancyStateChangeIntervalSec);
 }
 
-void TogglingOccupancySensorDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void TogglingOccupancySensorDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     mTimerDelegate.CancelTimer(this);
-    OccupancySensorDevice::UnRegister(provider);
+    OccupancySensorDevice::Unregister(provider);
 }
 
 void TogglingOccupancySensorDevice::OnOccupancyChanged(bool occupied)
diff --git a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.h b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.h
index b2edd870989..4f4bf9ccb18 100644
--- a/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.h
@@ -39,7 +39,7 @@ class TogglingOccupancySensorDevice : public OccupancySensorDevice, public Clust
 
     CHIP_ERROR Register(EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
     // OccupancySensingDelegate
     void OnOccupancyChanged(bool occupied) override;
diff --git a/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.cpp b/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.cpp
index ad894c7bbbd..c5fbfb371a8 100644
--- a/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.cpp
@@ -170,7 +170,7 @@ CHIP_ERROR LoggingOnOffLightDevice::Register(chip::EndpointId endpoint, CodeDriv
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void LoggingOnOffLightDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void LoggingOnOffLightDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
 
diff --git a/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.h b/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.h
index d4ea25c3fb0..01bfbaf227e 100644
--- a/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/on-off-light/LoggingOnOffLightDevice.h
@@ -45,7 +45,7 @@ class LoggingOnOffLightDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
 private:
     class OnOffDelegate : public Clusters::OnOffDelegate
diff --git a/examples/all-devices-app/all-devices-common/devices/root-node/BUILD.gn b/examples/all-devices-app/all-devices-common/devices/root-node/BUILD.gn
index 31e350fe718..b420e923402 100644
--- a/examples/all-devices-app/all-devices-common/devices/root-node/BUILD.gn
+++ b/examples/all-devices-app/all-devices-common/devices/root-node/BUILD.gn
@@ -30,6 +30,7 @@ source_set("root-node") {
     "${chip_root}/src/app/clusters/general-commissioning-server:bread-crumb-tracker",
     "${chip_root}/src/app/clusters/general-diagnostics-server",
     "${chip_root}/src/app/clusters/group-key-mgmt-server",
+    "${chip_root}/src/app/clusters/groupcast",
     "${chip_root}/src/app/clusters/operational-credentials-server",
     "${chip_root}/src/app/clusters/software-diagnostics-server",
     "${chip_root}/src/data-model-providers/codedriven",
diff --git a/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.cpp b/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.cpp
index b6b6c87b40e..4e796465678 100644
--- a/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.cpp
@@ -19,6 +19,8 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/InteractionModelEngine.h>
+#include <app/clusters/groupcast/GroupcastCluster.h>
+#include <app/clusters/groupcast/GroupcastContext.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
@@ -48,9 +50,12 @@ CHIP_ERROR RootNodeDevice::Register(EndpointId endpointId, CodeDrivenDataModelPr
 
     mBasicInformationCluster.Create(
         optionalAttributeSet,
-        BasicInformationCluster::Context{ .deviceInstanceInfoProvider = mContext.deviceInstanceInfoProvider,
-                                          .configurationManager       = mContext.configurationManager,
-                                          .platformManager            = mContext.platformManager });
+        BasicInformationCluster::Context{
+            .deviceInstanceInfoProvider = mContext.deviceInstanceInfoProvider,
+            .configurationManager       = mContext.configurationManager,
+            .platformManager            = mContext.platformManager,
+            .subscriptionsPerFabric     = InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric(),
+        });
 
     ReturnErrorOnFailure(provider.AddCluster(mBasicInformationCluster.Registration()));
     mGeneralCommissioningCluster.Create(
@@ -92,6 +97,15 @@ CHIP_ERROR RootNodeDevice::Register(EndpointId endpointId, CodeDrivenDataModelPr
     });
     ReturnErrorOnFailure(provider.AddCluster(mGroupKeyManagementCluster.Registration()));
 
+    mGroupcastCluster.Create(
+        GroupcastContext{
+            .fabricTable       = mContext.fabricTable,
+            .groupDataProvider = mContext.groupDataProvider,
+            .timerDelegate     = mContext.timerDelegate,
+        },
+        BitFlags<Groupcast::Feature>{ Groupcast::Feature::kListener });
+    ReturnErrorOnFailure(provider.AddCluster(mGroupcastCluster.Registration()));
+
     mSoftwareDiagnosticsServerCluster.Create(SoftwareDiagnosticsServerCluster::OptionalAttributeSet{},
                                              mContext.diagnosticDataProvider);
     ReturnErrorOnFailure(provider.AddCluster(mSoftwareDiagnosticsServerCluster.Registration()));
@@ -110,54 +124,67 @@ CHIP_ERROR RootNodeDevice::Register(EndpointId endpointId, CodeDrivenDataModelPr
                                               .sessionManager             = mContext.sessionManager,
                                               .dnssdServer                = mContext.dnssdServer,
                                               .commissioningWindowManager = mContext.commissioningWindowManager,
+                                              .dacProvider                = mContext.dacProvider,
+                                              .groupDataProvider          = mContext.groupDataProvider,
+                                              .accessControl              = mContext.accessControl,
+                                              .platformManager            = mContext.platformManager,
+                                              .eventManagement            = mContext.eventManagement,
+
                                           });
     ReturnErrorOnFailure(provider.AddCluster(mOperationalCredentialsCluster.Registration()));
 
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void RootNodeDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void RootNodeDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
-    if (mBasicInformationCluster.IsConstructed())
+
+    // De-init in reverse order as init, in case there were data dependencies.
+    if (mOperationalCredentialsCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mBasicInformationCluster.Cluster()));
-        mBasicInformationCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mOperationalCredentialsCluster.Cluster()));
+        mOperationalCredentialsCluster.Destroy();
     }
-    if (mGeneralCommissioningCluster.IsConstructed())
+    if (mAccessControlCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mGeneralCommissioningCluster.Cluster()));
-        mGeneralCommissioningCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mAccessControlCluster.Cluster()));
+        mAccessControlCluster.Destroy();
     }
-    if (mAdministratorCommissioningCluster.IsConstructed())
+    if (mSoftwareDiagnosticsServerCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mAdministratorCommissioningCluster.Cluster()));
-        mAdministratorCommissioningCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mSoftwareDiagnosticsServerCluster.Cluster()));
+        mSoftwareDiagnosticsServerCluster.Destroy();
     }
-    if (mGeneralDiagnosticsCluster.IsConstructed())
+    if (mGroupcastCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mGeneralDiagnosticsCluster.Cluster()));
-        mGeneralDiagnosticsCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mGroupcastCluster.Cluster()));
+        mGroupcastCluster.Destroy();
     }
     if (mGroupKeyManagementCluster.IsConstructed())
     {
         LogErrorOnFailure(provider.RemoveCluster(&mGroupKeyManagementCluster.Cluster()));
         mGroupKeyManagementCluster.Destroy();
     }
-    if (mSoftwareDiagnosticsServerCluster.IsConstructed())
+    if (mGeneralDiagnosticsCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mSoftwareDiagnosticsServerCluster.Cluster()));
-        mSoftwareDiagnosticsServerCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mGeneralDiagnosticsCluster.Cluster()));
+        mGeneralDiagnosticsCluster.Destroy();
     }
-    if (mAccessControlCluster.IsConstructed())
+    if (mAdministratorCommissioningCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mAccessControlCluster.Cluster()));
-        mAccessControlCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mAdministratorCommissioningCluster.Cluster()));
+        mAdministratorCommissioningCluster.Destroy();
     }
-    if (mOperationalCredentialsCluster.IsConstructed())
+    if (mGeneralCommissioningCluster.IsConstructed())
     {
-        LogErrorOnFailure(provider.RemoveCluster(&mOperationalCredentialsCluster.Cluster()));
-        mOperationalCredentialsCluster.Destroy();
+        LogErrorOnFailure(provider.RemoveCluster(&mGeneralCommissioningCluster.Cluster()));
+        mGeneralCommissioningCluster.Destroy();
+    }
+    if (mBasicInformationCluster.IsConstructed())
+    {
+        LogErrorOnFailure(provider.RemoveCluster(&mBasicInformationCluster.Cluster()));
+        mBasicInformationCluster.Destroy();
     }
 }
 
diff --git a/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.h b/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.h
index 586b75a59f9..cd1a85c874d 100644
--- a/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.h
@@ -26,12 +26,14 @@
 #include <app/clusters/general-commissioning-server/GeneralCommissioningCluster.h>
 #include <app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.h>
 #include <app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.h>
+#include <app/clusters/groupcast/GroupcastCluster.h>
 #include <app/clusters/operational-credentials-server/OperationalCredentialsCluster.h>
 #include <app/clusters/software-diagnostics-server/SoftwareDiagnosticsCluster.h>
 #include <app/server-cluster/ServerClusterInterfaceRegistry.h>
 #include <credentials/GroupDataProvider.h>
 #include <devices/Types.h>
 #include <devices/interface/SingleEndpointDevice.h>
+#include <lib/support/TimerDelegate.h>
 #include <platform/DiagnosticDataProvider.h>
 
 namespace chip {
@@ -57,8 +59,10 @@ class RootNodeDevice : public SingleEndpointDevice
         DeviceLoadStatusProvider & deviceLoadStatusProvider;
         DeviceLayer::DiagnosticDataProvider & diagnosticDataProvider;
         TestEventTriggerDelegate * testEventTriggerDelegate;
+        Credentials::DeviceAttestationCredentialsProvider & dacProvider;
+        EventManagement & eventManagement;
         SafeAttributePersistenceProvider & safeAttributePersistenceProvider;
-
+        TimerDelegate & timerDelegate;
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
         TermsAndConditionsProvider & termsAndConditionsProvider;
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -71,7 +75,7 @@ class RootNodeDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
 protected:
     Context mContext;
@@ -84,6 +88,7 @@ class RootNodeDevice : public SingleEndpointDevice
         mAdministratorCommissioningCluster;
     LazyRegisteredServerCluster<Clusters::GeneralDiagnosticsCluster> mGeneralDiagnosticsCluster;
     LazyRegisteredServerCluster<Clusters::GroupKeyManagementCluster> mGroupKeyManagementCluster;
+    LazyRegisteredServerCluster<Clusters::GroupcastCluster> mGroupcastCluster;
     LazyRegisteredServerCluster<Clusters::SoftwareDiagnosticsServerCluster> mSoftwareDiagnosticsServerCluster;
     LazyRegisteredServerCluster<Clusters::AccessControlCluster> mAccessControlCluster;
     LazyRegisteredServerCluster<Clusters::OperationalCredentialsCluster> mOperationalCredentialsCluster;
diff --git a/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.cpp b/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.cpp
index 953a24e6098..cc5b7491484 100644
--- a/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.cpp
@@ -47,9 +47,9 @@ CHIP_ERROR WifiRootNodeDevice::Register(EndpointId endpointId, CodeDrivenDataMod
     return CHIP_NO_ERROR;
 }
 
-void WifiRootNodeDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void WifiRootNodeDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
-    RootNodeDevice::UnRegister(provider);
+    RootNodeDevice::Unregister(provider);
     if (mNetworkCommissioningCluster.IsConstructed())
     {
         LogErrorOnFailure(provider.RemoveCluster(&mNetworkCommissioningCluster.Cluster()));
diff --git a/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.h b/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.h
index 36435335e00..ccc939d48c9 100644
--- a/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/root-node/WifiRootNodeDevice.h
@@ -39,7 +39,7 @@ class WifiRootNodeDevice : public RootNodeDevice
 
     CHIP_ERROR Register(EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
 private:
     LazyRegisteredServerCluster<Clusters::NetworkCommissioningCluster> mNetworkCommissioningCluster;
diff --git a/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.cpp b/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.cpp
index b6cf0f14bfe..9427b80d256 100644
--- a/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.cpp
@@ -66,7 +66,7 @@ CHIP_ERROR SpeakerDevice::Register(chip::EndpointId endpoint, CodeDrivenDataMode
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
-void SpeakerDevice::UnRegister(CodeDrivenDataModelProvider & provider)
+void SpeakerDevice::Unregister(CodeDrivenDataModelProvider & provider)
 {
     SingleEndpointUnregistration(provider);
     if (mLevelControlCluster.IsConstructed())
diff --git a/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.h b/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.h
index 786b444796b..79ea2fe11fd 100644
--- a/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.h
+++ b/examples/all-devices-app/all-devices-common/devices/speaker/SpeakerDevice.h
@@ -37,7 +37,7 @@ class SpeakerDevice : public SingleEndpointDevice
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
                         EndpointId parentId = kInvalidEndpointId) override;
-    void UnRegister(CodeDrivenDataModelProvider & provider) override;
+    void Unregister(CodeDrivenDataModelProvider & provider) override;
 
     // Accessors for subclasses/implementations to interact with clusters
     Clusters::OnOffCluster & OnOffCluster();
diff --git a/examples/all-devices-app/all-devices-common/devices/speaker/impl/LoggingSpeakerDevice.cpp b/examples/all-devices-app/all-devices-common/devices/speaker/impl/LoggingSpeakerDevice.cpp
index d2e8877714b..6e49940fc2f 100644
--- a/examples/all-devices-app/all-devices-common/devices/speaker/impl/LoggingSpeakerDevice.cpp
+++ b/examples/all-devices-app/all-devices-common/devices/speaker/impl/LoggingSpeakerDevice.cpp
@@ -15,6 +15,7 @@
  *    limitations under the License.
  */
 #include <devices/speaker/impl/LoggingSpeakerDevice.h>
+#include <inttypes.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 using namespace chip::app::Clusters;
@@ -30,7 +31,10 @@ LoggingSpeakerDevice::~LoggingSpeakerDevice() {}
 
 void LoggingSpeakerDevice::OnLevelChanged(uint8_t value)
 {
-    ChipLogProgress(AppServer, "LoggingSpeakerDevice: Volume set to %u", value);
+    uint8_t min  = LevelControlCluster().GetMinLevel();
+    uint8_t max  = LevelControlCluster().GetMaxLevel();
+    uint32_t pct = (max > min) ? (static_cast<uint32_t>(value - min) * 100) / (max - min) : 0;
+    ChipLogProgress(AppServer, "LoggingSpeakerDevice: Volume set to %u (%" PRIu32 "%%)", value, pct);
 }
 
 void LoggingSpeakerDevice::OnOptionsChanged(BitMask<Clusters::LevelControl::OptionsBitmap> value)
diff --git a/examples/all-devices-app/esp32/main/CMakeLists.txt b/examples/all-devices-app/esp32/main/CMakeLists.txt
index bee0e023d48..15875429f9a 100644
--- a/examples/all-devices-app/esp32/main/CMakeLists.txt
+++ b/examples/all-devices-app/esp32/main/CMakeLists.txt
@@ -15,7 +15,7 @@
 #    limitations under the License.
 #
 
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+get_filename_component(CHIP_ROOT "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip" REALPATH)
 get_filename_component(ALL_DEVICES_COMMON_DIR ${CHIP_ROOT}/examples/all-devices-app/all-devices-common REALPATH)
 
 set(PRIV_INCLUDE_DIRS_LIST
@@ -24,110 +24,39 @@ set(PRIV_INCLUDE_DIRS_LIST
                       "${CHIP_ROOT}/examples/providers"
 )
 
-# Application sources
-set(APP_SRCS
-    "${CMAKE_CURRENT_LIST_DIR}/main.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/DeviceShellCommands.cpp"
-
-    # All-devices common sources
-    # keep-sorted: start
-    "${ALL_DEVICES_COMMON_DIR}/devices/boolean-state-sensor/BooleanStateSensorDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/chime/ChimeDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/chime/impl/LoggingChimeDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/interface/DeviceInterface.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/interface/SingleEndpointDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/occupancy-sensor/impl/TogglingOccupancySensorDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/occupancy-sensor/OccupancySensorDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/on-off-light/LoggingOnOffLightDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/root-node/RootNodeDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/root-node/WifiRootNodeDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/speaker/SpeakerDevice.cpp"
-    "${ALL_DEVICES_COMMON_DIR}/devices/speaker/impl/LoggingSpeakerDevice.cpp"
-    # keep-sorted: end
-
-    # Providers
-    "${CHIP_ROOT}/examples/providers/DeviceInfoProviderImpl.cpp"
-
-    # Shell extension
-    "${CHIP_ROOT}/examples/platform/esp32/shell_extension/launch.cpp"
-)
-
-# Code-driven data model provider sources
-set(CODE_DRIVEN_SRCS
-    "${CHIP_ROOT}/src/data-model-providers/codedriven/CodeDrivenDataModelProvider.cpp"
-    "${CHIP_ROOT}/src/data-model-providers/codedriven/endpoint/EndpointInterfaceRegistry.cpp"
-    "${CHIP_ROOT}/src/data-model-providers/codedriven/endpoint/SpanEndpoint.cpp"
-)
-
-# Server and core app sources
-set(SERVER_SRCS
+# Keep top-level src/app files explicit to avoid pulling unrelated src/app/*.cpp.
+set(APP_TOPLEVEL_EXTRA_SRCS
     "${CHIP_ROOT}/src/app/SafeAttributePersistenceProvider.cpp"
     "${CHIP_ROOT}/src/app/StorageDelegateWrapper.cpp"
-    "${CHIP_ROOT}/src/app/server/AclStorage.cpp"
-    "${CHIP_ROOT}/src/app/server/CommissioningWindowManager.cpp"
-    "${CHIP_ROOT}/src/app/server/DefaultAclStorage.cpp"
-    "${CHIP_ROOT}/src/app/server/DefaultTermsAndConditionsProvider.cpp"
-    "${CHIP_ROOT}/src/app/server/Dnssd.cpp"
-    "${CHIP_ROOT}/src/app/server/EchoHandler.cpp"
-    "${CHIP_ROOT}/src/app/server/Server.cpp"
-    "${CHIP_ROOT}/src/app/server/TermsAndConditionsManager.cpp"
-    "${CHIP_ROOT}/src/app/server/JointFabricAdministrator.cpp"
-    "${CHIP_ROOT}/src/app/server/JointFabricDatastore.cpp"
 )
 
-# Persistence sources
-set(PERSISTENCE_SRCS
-    "${CHIP_ROOT}/src/app/persistence/AttributePersistence.cpp"
-    "${CHIP_ROOT}/src/app/persistence/AttributePersistenceProviderInstance.cpp"
-    "${CHIP_ROOT}/src/app/persistence/DefaultAttributePersistenceProvider.cpp"
-    "${CHIP_ROOT}/src/app/persistence/DeferredAttributePersistenceProvider.cpp"
-    "${CHIP_ROOT}/src/app/persistence/String.cpp"
-)
+set(SRC_DIRS_LIST
+    "${CMAKE_CURRENT_LIST_DIR}"
+    "${CHIP_ROOT}/examples/providers"
+    "${CHIP_ROOT}/examples/platform/esp32/shell_extension"
+    "${CHIP_ROOT}/src/data-model-providers/codedriven"
+    "${CHIP_ROOT}/src/data-model-providers/codedriven/endpoint"
+    "${CHIP_ROOT}/src/app/server"
+    "${CHIP_ROOT}/src/app/persistence"
+    "${CHIP_ROOT}/src/app/server-cluster"
 
-# Server cluster infrastructure
-set(SERVER_CLUSTER_SRCS
-    "${CHIP_ROOT}/src/app/server-cluster/AttributeListBuilder.cpp"
-    "${CHIP_ROOT}/src/app/server-cluster/DefaultServerCluster.cpp"
-    "${CHIP_ROOT}/src/app/server-cluster/ServerClusterInterface.cpp"
-    "${CHIP_ROOT}/src/app/server-cluster/ServerClusterInterfaceRegistry.cpp"
-    "${CHIP_ROOT}/src/app/server-cluster/SingleEndpointServerClusterRegistry.cpp"
-)
-
-# Cluster implementations (new-style, excluding CodegenIntegration.cpp files)
-set(CLUSTER_SRCS
-    # keep-sorted: start
-    "${CHIP_ROOT}/src/app/clusters/access-control-server/access-control-cluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/access-control-server/ArlEncoder.cpp"
-    "${CHIP_ROOT}/src/app/clusters/administrator-commissioning-server/AdministratorCommissioningCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/administrator-commissioning-server/AdministratorCommissioningLogic.cpp"
-    "${CHIP_ROOT}/src/app/clusters/basic-information/BasicInformationCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/boolean-state-server/BooleanStateCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/chime-server/ChimeCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/descriptor/DescriptorCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/general-commissioning-server/GeneralCommissioningCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/groups-server/GroupsCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/identify-server/IdentifyCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/level-control/LevelControlCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/network-commissioning/NetworkCommissioningCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/network-commissioning/WifiScanResponse.cpp"
-    "${CHIP_ROOT}/src/app/clusters/occupancy-sensor-server/OccupancySensingCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/on-off-server/OnOffCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/on-off-server/OnOffLightingCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/scenes-server/ExtensionFieldSetsImpl.cpp"
-    "${CHIP_ROOT}/src/app/clusters/scenes-server/SceneHandlerImpl.cpp"
-    "${CHIP_ROOT}/src/app/clusters/scenes-server/ScenesManagementCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/scenes-server/SceneTableImpl.cpp"
-    "${CHIP_ROOT}/src/app/clusters/software-diagnostics-server/SoftwareDiagnosticsCluster.cpp"
-    "${CHIP_ROOT}/src/app/clusters/software-diagnostics-server/software-fault-listener.cpp"
-    "${CHIP_ROOT}/src/app/clusters/wifi-network-diagnostics-server/WiFiNetworkDiagnosticsCluster.cpp"
-    # keep-sorted: end
+    # all-devices-common device modules
+    "${ALL_DEVICES_COMMON_DIR}/devices/boolean-state-sensor"
+    "${ALL_DEVICES_COMMON_DIR}/devices/chime"
+    "${ALL_DEVICES_COMMON_DIR}/devices/chime/impl"
+    "${ALL_DEVICES_COMMON_DIR}/devices/interface"
+    "${ALL_DEVICES_COMMON_DIR}/devices/occupancy-sensor"
+    "${ALL_DEVICES_COMMON_DIR}/devices/occupancy-sensor/impl"
+    "${ALL_DEVICES_COMMON_DIR}/devices/on-off-light"
+    "${ALL_DEVICES_COMMON_DIR}/devices/root-node"
+    "${ALL_DEVICES_COMMON_DIR}/devices/speaker"
+    "${ALL_DEVICES_COMMON_DIR}/devices/speaker/impl"
 )
 
 idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
-                       SRCS ${APP_SRCS} ${CODE_DRIVEN_SRCS} ${SERVER_SRCS} ${PERSISTENCE_SRCS} ${SERVER_CLUSTER_SRCS} ${CLUSTER_SRCS})
+                       SRC_DIRS ${SRC_DIRS_LIST})
+
+target_sources(${COMPONENT_LIB} PRIVATE ${APP_TOPLEVEL_EXTRA_SRCS})
 
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
diff --git a/examples/all-devices-app/esp32/main/main.cpp b/examples/all-devices-app/esp32/main/main.cpp
index 6de1806b7f8..aa2b7d9d0b0 100644
--- a/examples/all-devices-app/esp32/main/main.cpp
+++ b/examples/all-devices-app/esp32/main/main.cpp
@@ -102,6 +102,7 @@ Credentials::GroupDataProviderImpl gGroupDataProvider;
 chip::app::CodeDrivenDataModelProvider * gDataModelProvider = nullptr;
 std::unique_ptr<WifiRootNodeDevice> gRootNodeDevice;
 std::unique_ptr<DeviceInterface> gConstructedDevice;
+DefaultTimerDelegate gTimerDelegate;
 
 void DeInitBLEIfCommissioned()
 {
@@ -220,23 +221,25 @@ chip::app::DataModel::Provider * PopulateCodeDrivenDataModelProvider(PersistentS
 
     gRootNodeDevice = std::make_unique<WifiRootNodeDevice>(
         RootNodeDevice::Context {
-            .commissioningWindowManager           = Server::GetInstance().GetCommissioningWindowManager(), //
-                .configurationManager             = DeviceLayer::ConfigurationMgr(),                       //
-                .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),  //
-                .fabricTable                      = Server::GetInstance().GetFabricTable(),                //
-                .accessControl                    = Server::GetInstance().GetAccessControl(),              //
-                .persistentStorage                = Server::GetInstance().GetPersistentStorage(),          //
-                .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),            //
-                .deviceInstanceInfoProvider       = *provider,                                             //
-                .platformManager                  = DeviceLayer::PlatformMgr(),                            //
-                .groupDataProvider                = gGroupDataProvider,                                    //
-                .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),       //
-                .dnssdServer                      = DnssdServer::Instance(),                               //
-                .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                //
-                .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),              //
-                .testEventTriggerDelegate         = testEventTriggerDelegate,                              //
-                .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                     //
-
+            .commissioningWindowManager           = Server::GetInstance().GetCommissioningWindowManager(),   //
+                .configurationManager             = DeviceLayer::ConfigurationMgr(),                         //
+                .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),    //
+                .fabricTable                      = Server::GetInstance().GetFabricTable(),                  //
+                .accessControl                    = Server::GetInstance().GetAccessControl(),                //
+                .persistentStorage                = Server::GetInstance().GetPersistentStorage(),            //
+                .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),              //
+                .deviceInstanceInfoProvider       = *provider,                                               //
+                .platformManager                  = DeviceLayer::PlatformMgr(),                              //
+                .groupDataProvider                = gGroupDataProvider,                                      //
+                .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),         //
+                .dnssdServer                      = DnssdServer::Instance(),                                 //
+                .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                  //
+                .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),                //
+                .testEventTriggerDelegate         = testEventTriggerDelegate,                                //
+                .dacProvider                      = *Credentials::GetDeviceAttestationCredentialsProvider(), //
+                .eventManagement                  = EventManagement::GetInstance(),                          //
+                .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                       //
+                .timerDelegate                    = gTimerDelegate,                                          //
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
                 .termsAndConditionsProvider = TermsAndConditionsManager::GetInstance(),
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -272,11 +275,10 @@ chip::app::DataModel::Provider * PopulateCodeDrivenDataModelProvider(PersistentS
 
 void InitServer(intptr_t context)
 {
-    static DefaultTimerDelegate timerDelegate;
     DeviceFactory::GetInstance().Init(DeviceFactory::Context{
         .groupDataProvider = gGroupDataProvider,                     //
         .fabricTable       = Server::GetInstance().GetFabricTable(), //
-        .timerDelegate     = timerDelegate,                          //
+        .timerDelegate     = gTimerDelegate,                         //
     });
 
     static chip::CommonCaseDeviceServerInitParams initParams;
diff --git a/examples/all-devices-app/posix/app_options/AppOptions.cpp b/examples/all-devices-app/posix/app_options/AppOptions.cpp
index ef6a4cf95a7..0355e023eae 100644
--- a/examples/all-devices-app/posix/app_options/AppOptions.cpp
+++ b/examples/all-devices-app/posix/app_options/AppOptions.cpp
@@ -18,8 +18,12 @@
 
 #include <app_options/AppOptions.h>
 #include <devices/device-factory/DeviceFactory.h>
+#include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <cstdlib>
+#include <cstring>
+
 using namespace chip;
 using namespace chip::ArgParser;
 
@@ -28,33 +32,105 @@ constexpr uint16_t kOptionDeviceType = 0xffd0;
 constexpr uint16_t kOptionEndpoint   = 0xffd1;
 constexpr uint16_t kOptionWiFi       = 0xffd2;
 
-const char * AppOptions::mDeviceTypeName     = "contact-sensor"; // defaulting to contact sensor if not specified
-chip::EndpointId AppOptions::mDeviceEndpoint = 1;                // defaulting to endpoint 1 if not specified
-bool AppOptions::mEnableWiFi                 = false;
+std::vector<AppOptions::DeviceConfig> AppOptions::mDeviceConfigs;
+bool AppOptions::mEnableWiFi = false;
+
+const std::vector<AppOptions::DeviceConfig> & AppOptions::GetDeviceConfigs()
+{
+    if (mDeviceConfigs.empty())
+    {
+        static const std::vector<DeviceConfig> kDefault = { { "contact-sensor", 1 } };
+        return kDefault;
+    }
+    return mDeviceConfigs;
+}
+
+bool AppOptions::ParseEndpointId(const char * str, chip::EndpointId & endpoint)
+{
+    char * endptr;
+    long val = strtol(str, &endptr, 10);
+
+    if (endptr == str || *endptr != '\0' || val < 0 || val > UINT16_MAX)
+    {
+        return false;
+    }
+
+    endpoint = static_cast<chip::EndpointId>(val);
+    return true;
+}
+
+/**
+ * Parses a device configuration string in the format "type" or "type:endpoint".
+ *
+ * Example: "speaker:2" -> type="speaker", endpoint=2
+ *
+ * @param value The string to parse.
+ * @param config The DeviceConfig structure to populate.
+ * @return true on success, false on failure (e.g. invalid format or endpoint ID).
+ */
+bool AppOptions::ParseDeviceConfig(const char * value, DeviceConfig & config)
+{
+    VerifyOrReturnValue(value != nullptr, false);
+
+    config.endpoint = 1; // Default to endpoint 1
+
+    const char * colonPos = strchr(value, ':');
+    if (colonPos != nullptr)
+    {
+        config.type.assign(value, static_cast<size_t>(colonPos - value));
+
+        if (!ParseEndpointId(colonPos + 1, config.endpoint))
+        {
+            ChipLogError(Support, "Invalid endpoint ID in device config: %s\n", value);
+            return false;
+        }
+    }
+    else
+    {
+        config.type = value;
+    }
+    return true;
+}
 
 bool AppOptions::AllDevicesAppOptionHandler(const char * program, OptionSet * options, int identifier, const char * name,
                                             const char * value)
 {
     switch (identifier)
     {
-    case kOptionDeviceType:
-        if (value == nullptr)
+    case kOptionDeviceType: {
+        DeviceConfig config;
+        if (!ParseDeviceConfig(value, config))
         {
-            ChipLogError(Support, "INTERNAL ERROR: No device type value passed in.\n");
             return false;
         }
-        ChipLogProgress(AppServer, "Using the device type of %s", value);
-        mDeviceTypeName = value;
+
+        ChipLogProgress(AppServer, "Adding device type %s on endpoint %d", config.type.c_str(), config.endpoint);
+        mDeviceConfigs.push_back(std::move(config));
         return true;
-    case kOptionEndpoint:
-        if (value == nullptr)
+    }
+    case kOptionEndpoint: {
+        chip::EndpointId ep;
+        if (value == nullptr || !ParseEndpointId(value, ep))
         {
-            ChipLogError(Support, "INTERNAL ERROR: No endpoint ID value passed in.\n");
+            ChipLogError(Support, "Invalid endpoint ID: %s\n", value ? value : "(null)");
             return false;
         }
-        mDeviceEndpoint = static_cast<EndpointId>(atoi(value));
-        ChipLogProgress(AppServer, "Using endpoint %d for the device.", mDeviceEndpoint);
+
+        if (mDeviceConfigs.empty())
+        {
+            ChipLogError(Support, "Warning: --endpoint specified before --device. Creating default 'contact-sensor'.");
+            DeviceConfig config;
+            config.type     = "contact-sensor";
+            config.endpoint = ep;
+            mDeviceConfigs.push_back(std::move(config));
+        }
+        else
+        {
+            mDeviceConfigs.back().endpoint = ep;
+            ChipLogProgress(AppServer, "Updated last device to endpoint %d", ep);
+        }
         return true;
+    }
     case kOptionWiFi:
         mEnableWiFi = true;
         ChipLogProgress(AppServer, "WiFi usage enabled");
@@ -88,11 +164,13 @@ OptionSet * AppOptions::GetOptions()
         }
         result.replace(result.length() - 1, 1, ">");
         result += "\n";
-        result += "       Select the device to start up\n\n";
+        result += "       Select the device to start up. Format: 'type' or 'type:endpoint'\n";
+        result += "       Can be specified multiple times for multi-endpoint devices.\n";
+        result += "       Example: --device chime:1 --device speaker:2\n\n";
 
         // rest of the help
         result += "  --endpoint <endpoint-number>\n";
-        result += "       Define the endpoint to start on (default 1)\n\n";
+        result += "       Define the endpoint for the preceding device (default 1)\n\n";
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
         result += "  --wifi\n";
diff --git a/examples/all-devices-app/posix/app_options/AppOptions.h b/examples/all-devices-app/posix/app_options/AppOptions.h
index 251169e9826..5d358ff2585 100644
--- a/examples/all-devices-app/posix/app_options/AppOptions.h
+++ b/examples/all-devices-app/posix/app_options/AppOptions.h
@@ -22,14 +22,31 @@
 #include <lib/core/DataModelTypes.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <string>
+#include <vector>
+
 class AppOptions
 {
 public:
+    /**
+     * @brief Configuration for a single device instance.
+     *
+     * This structure holds the device type string (e.g. "on-off-light") and the
+     * endpoint ID where this device should be instantiated.
+     */
+    struct DeviceConfig
+    {
+        std::string type;
+        chip::EndpointId endpoint;
+    };
+
     static chip::ArgParser::OptionSet * GetOptions();
 
-    static const char * GetDeviceType() { return mDeviceTypeName; }
+    static const std::vector<DeviceConfig> & GetDeviceConfigs();
 
-    static chip::EndpointId GetDeviceEndpoint() { return mDeviceEndpoint; }
+    static const char * GetDeviceType() { return GetDeviceConfigs().front().type.c_str(); }
+
+    static chip::EndpointId GetDeviceEndpoint() { return GetDeviceConfigs().front().endpoint; }
 
     static bool EnableWiFi() { return mEnableWiFi; }
 
@@ -37,7 +54,9 @@ class AppOptions
     static bool AllDevicesAppOptionHandler(const char * program, chip::ArgParser::OptionSet * options, int identifier,
                                            const char * name, const char * value);
 
-    static const char * mDeviceTypeName;
-    static chip::EndpointId mDeviceEndpoint;
+    static bool ParseEndpointId(const char * str, chip::EndpointId & endpoint);
+    static bool ParseDeviceConfig(const char * value, DeviceConfig & config);
+
+    static std::vector<DeviceConfig> mDeviceConfigs;
     static bool mEnableWiFi;
 };
diff --git a/examples/all-devices-app/posix/main.cpp b/examples/all-devices-app/posix/main.cpp
index 4bc92b6a576..1eb853e341c 100644
--- a/examples/all-devices-app/posix/main.cpp
+++ b/examples/all-devices-app/posix/main.cpp
@@ -55,6 +55,7 @@ AppMainLoopImplementation * gMainLoopImplementation = nullptr;
 AllDevicesExampleDeviceInfoProviderImpl gExampleDeviceInfoProvider;
 Credentials::GroupDataProviderImpl gGroupDataProvider;
 chip::app::DefaultSafeAttributePersistenceProvider gSafeAttributePersistenceProvider;
+DefaultTimerDelegate gTimerDelegate;
 
 // To hold SPAKE2+ verifier, discriminator, passcode
 LinuxCommissionableDataProvider gCommissionableDataProvider;
@@ -96,8 +97,10 @@ class CodeDrivenDataModelDevices
         DeviceLoadStatusProvider & deviceLoadStatusProvider;
         DeviceLayer::DiagnosticDataProvider & diagnosticDataProvider;
         TestEventTriggerDelegate * testEventTriggerDelegate;
+        Credentials::DeviceAttestationCredentialsProvider & dacProvider;
+        EventManagement & eventManagement;
         SafeAttributePersistenceProvider & safeAttributePersistenceProvider;
-
+        TimerDelegate & timerDelegate;
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
         TermsAndConditionsProvider & termsAndConditionsProvider;
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -122,8 +125,10 @@ class CodeDrivenDataModelDevices
                     .deviceLoadStatusProvider         = mContext.deviceLoadStatusProvider,         //
                     .diagnosticDataProvider           = mContext.diagnosticDataProvider,           //
                     .testEventTriggerDelegate         = mContext.testEventTriggerDelegate,         //
+                    .dacProvider                      = mContext.dacProvider,                      //
+                    .eventManagement                  = mContext.eventManagement,                  //
                     .safeAttributePersistenceProvider = mContext.safeAttributePersistenceProvider, //
-
+                    .timerDelegate                    = mContext.timerDelegate,                    //
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
                     .termsAndConditionsProvider = mContext.termsAndConditionsProvider,
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -142,21 +147,25 @@ class CodeDrivenDataModelDevices
         ReturnErrorOnFailure(mAttributePersistence.Init(&mContext.storageDelegate));
         ReturnErrorOnFailure(mRootNode.RootDevice().Register(kRootEndpointId, mDataModelProvider, kInvalidEndpointId));
 
-        mConstructedDevice = DeviceFactory::GetInstance().Create(AppOptions::GetDeviceType());
-        VerifyOrReturnError(mConstructedDevice, CHIP_ERROR_NO_MEMORY);
-        ReturnErrorOnFailure(mConstructedDevice->Register(AppOptions::GetDeviceEndpoint(), mDataModelProvider, kInvalidEndpointId));
+        for (const auto & config : AppOptions::GetDeviceConfigs())
+        {
+            auto device = DeviceFactory::GetInstance().Create(config.type);
+            VerifyOrReturnError(device, CHIP_ERROR_NO_MEMORY);
+            ReturnErrorOnFailure(device->Register(config.endpoint, mDataModelProvider, kInvalidEndpointId));
+            mConstructedDevices.push_back(std::move(device));
+        }
 
         return CHIP_NO_ERROR;
     }
 
     void Shutdown()
     {
-        if (mConstructedDevice)
+        for (auto & device : mConstructedDevices)
         {
-            mConstructedDevice->UnRegister(mDataModelProvider);
-            mConstructedDevice.reset();
+            device->Unregister(mDataModelProvider);
         }
-        mRootNode.RootDevice().UnRegister(mDataModelProvider);
+        mConstructedDevices.clear();
+        mRootNode.RootDevice().Unregister(mDataModelProvider);
     }
 
     chip::app::CodeDrivenDataModelProvider & DataModelProvider() { return mDataModelProvider; }
@@ -168,18 +177,17 @@ class CodeDrivenDataModelDevices
     chip::app::CodeDrivenDataModelProvider mDataModelProvider;
 
     AppRootNode mRootNode;
-    std::unique_ptr<DeviceInterface> mConstructedDevice;
+    std::vector<std::unique_ptr<DeviceInterface>> mConstructedDevices;
 };
 
 void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
 {
     gMainLoopImplementation = mainLoop;
 
-    static DefaultTimerDelegate timerDelegate;
     DeviceFactory::GetInstance().Init(DeviceFactory::Context{
         .groupDataProvider = gGroupDataProvider,                     //
         .fabricTable       = Server::GetInstance().GetFabricTable(), //
-        .timerDelegate     = timerDelegate,                          //
+        .timerDelegate     = gTimerDelegate,                         //
 
     });
 
@@ -193,7 +201,7 @@ void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
     DeviceLayer::DeviceInstanceInfoProvider * provider = DeviceLayer::GetDeviceInstanceInfoProvider();
     if (provider == nullptr)
     {
-        ChipLogError(AppServer, "Failed to get the DeviceInstanceInfoProvifer.");
+        ChipLogError(AppServer, "Failed to get the DeviceInstanceInfoProvider.");
         chipDie();
     }
 
@@ -201,24 +209,31 @@ void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
     SuccessOrDie(gSafeAttributePersistenceProvider.Init(initParams.persistentStorageDelegate));
     SetSafeAttributePersistenceProvider(&gSafeAttributePersistenceProvider);
 
+    // Set the global DAC provider before server/cluster init so any integration path that
+    // snapshots the provider during construction sees a valid implementation.
+    SetDeviceAttestationCredentialsProvider(Credentials::Examples::GetExampleDACProvider());
+
     static CodeDrivenDataModelDevices devices({
-        .storageDelegate                      = *initParams.persistentStorageDelegate,                 //
-            .commissioningWindowManager       = Server::GetInstance().GetCommissioningWindowManager(), //
-            .configurationManager             = DeviceLayer::ConfigurationMgr(),                       //
-            .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),  //
-            .fabricTable                      = Server::GetInstance().GetFabricTable(),                //
-            .accessControl                    = Server::GetInstance().GetAccessControl(),              //
-            .persistentStorage                = Server::GetInstance().GetPersistentStorage(),          //
-            .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),            //
-            .deviceInstanceInfoProvider       = *provider,                                             //
-            .platformManager                  = DeviceLayer::PlatformMgr(),                            //
-            .groupDataProvider                = gGroupDataProvider,                                    //
-            .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),       //
-            .dnssdServer                      = DnssdServer::Instance(),                               //
-            .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                //
-            .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),              //
-            .testEventTriggerDelegate         = initParams.testEventTriggerDelegate,                   //
-            .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                     //
+        .storageDelegate                      = *initParams.persistentStorageDelegate,                   //
+            .commissioningWindowManager       = Server::GetInstance().GetCommissioningWindowManager(),   //
+            .configurationManager             = DeviceLayer::ConfigurationMgr(),                         //
+            .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),    //
+            .fabricTable                      = Server::GetInstance().GetFabricTable(),                  //
+            .accessControl                    = Server::GetInstance().GetAccessControl(),                //
+            .persistentStorage                = Server::GetInstance().GetPersistentStorage(),            //
+            .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),              //
+            .deviceInstanceInfoProvider       = *provider,                                               //
+            .platformManager                  = DeviceLayer::PlatformMgr(),                              //
+            .groupDataProvider                = gGroupDataProvider,                                      //
+            .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),         //
+            .dnssdServer                      = DnssdServer::Instance(),                                 //
+            .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                  //
+            .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),                //
+            .testEventTriggerDelegate         = initParams.testEventTriggerDelegate,                     //
+            .dacProvider                      = *Credentials::GetDeviceAttestationCredentialsProvider(), //
+            .eventManagement                  = EventManagement::GetInstance(),                          //
+            .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                       //
+            .timerDelegate                    = gTimerDelegate,                                          //
 
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
             .termsAndConditionsProvider = TermsAndConditionsManager::GetInstance(),
@@ -267,8 +282,6 @@ void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
     SuccessOrDie(chip::DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(payload.productID));
     PrintOnboardingCodes(payload);
 
-    SetDeviceAttestationCredentialsProvider(Credentials::Examples::GetExampleDACProvider());
-
     chip::app::SetTerminateHandler(StopSignalHandler);
 
     // This message is used as a marker for when the application process has started.
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
index 512c99f0d09..eabc37808be 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
@@ -260,7 +260,8 @@ class GroupSettingFragment : Fragment() {
             hexStringToByteArray(epochKey1Ed.text.toString()),
             epochStartTime1Ed.text.toString().toULong().toLong(),
             hexStringToByteArray(epochKey2Ed.text.toString()),
-            epochStartTime2Ed.text.toString().toULong().toLong()
+            epochStartTime2Ed.text.toString().toULong().toLong(),
+            0
           )
         sendKeySetWrite(keySetWritestruct)
         requireActivity().runOnUiThread { dialog.dismiss() }
diff --git a/examples/base-platform-app/silabs/data_model/platform-thread-app.matter b/examples/base-platform-app/silabs/data_model/platform-thread-app.matter
index 5872f6ebca6..2baa15d9d6d 100644
--- a/examples/base-platform-app/silabs/data_model/platform-thread-app.matter
+++ b/examples/base-platform-app/silabs/data_model/platform-thread-app.matter
@@ -1250,7 +1250,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1737,7 +1736,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1746,6 +1750,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1770,12 +1775,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1802,13 +1814,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/base-platform-app/silabs/data_model/platform-thread-icd-app.matter b/examples/base-platform-app/silabs/data_model/platform-thread-icd-app.matter
index 7276ba6678d..721e05a2378 100644
--- a/examples/base-platform-app/silabs/data_model/platform-thread-icd-app.matter
+++ b/examples/base-platform-app/silabs/data_model/platform-thread-icd-app.matter
@@ -1250,7 +1250,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1737,7 +1736,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1746,6 +1750,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1770,12 +1775,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1802,13 +1814,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/base-platform-app/silabs/data_model/platform-wifi-app.matter b/examples/base-platform-app/silabs/data_model/platform-wifi-app.matter
index 7b61e62a916..c663a9a6454 100644
--- a/examples/base-platform-app/silabs/data_model/platform-wifi-app.matter
+++ b/examples/base-platform-app/silabs/data_model/platform-wifi-app.matter
@@ -1250,7 +1250,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1646,7 +1645,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1655,6 +1659,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1679,12 +1684,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1711,13 +1723,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/base-platform-app/silabs/data_model/platform-wifi-icd-app.matter b/examples/base-platform-app/silabs/data_model/platform-wifi-icd-app.matter
index a65c02c087f..07bf5ab0dce 100644
--- a/examples/base-platform-app/silabs/data_model/platform-wifi-icd-app.matter
+++ b/examples/base-platform-app/silabs/data_model/platform-wifi-icd-app.matter
@@ -1250,7 +1250,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1646,7 +1645,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1655,6 +1659,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1679,12 +1684,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1711,13 +1723,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 8162416b899..b380df36545 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1513,7 +1513,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2172,7 +2171,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2181,6 +2185,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2205,12 +2210,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2237,13 +2249,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2280,7 +2292,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2426,6 +2438,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2596,6 +2609,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2723,8 +2737,8 @@ endpoint 2 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    callback attribute featureMap default = 0;
-    callback attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index b3a411664cd..8c90fc969bc 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1905,6 +1905,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4224,6 +4240,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/camera-app/camera-common/camera-app.matter b/examples/camera-app/camera-common/camera-app.matter
index 43afdf9015e..0f2c648aba8 100644
--- a/examples/camera-app/camera-common/camera-app.matter
+++ b/examples/camera-app/camera-common/camera-app.matter
@@ -1580,7 +1580,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2331,7 +2330,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2340,6 +2344,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2364,12 +2369,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2396,13 +2408,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2997,7 +3009,7 @@ internal cluster FaultInjection = 4294048774 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -3146,6 +3158,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3344,6 +3357,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/camera-app/camera-common/camera-app.zap b/examples/camera-app/camera-common/camera-app.zap
index 8fdd32cdb43..133adff037e 100644
--- a/examples/camera-app/camera-common/camera-app.zap
+++ b/examples/camera-app/camera-common/camera-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1941,6 +1941,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4595,6 +4611,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/camera-app/camera-common/src/camera-app.cpp b/examples/camera-app/camera-common/src/camera-app.cpp
index 723457bf709..b07c9c6694d 100644
--- a/examples/camera-app/camera-common/src/camera-app.cpp
+++ b/examples/camera-app/camera-common/src/camera-app.cpp
@@ -341,6 +341,13 @@ void CameraApp::ShutdownCameraDeviceClusters()
         ChipLogError(Camera, "CameraAVStreamMgmt Server unregister error: %" CHIP_ERROR_FORMAT, err.Format());
     }
     mAVStreamMgmtServer.Destroy();
+
+    err = CodegenDataModelProvider::Instance().Registry().Unregister(&mAVSettingsUserLevelMgmtServer.Cluster());
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Camera, "CameraAVSettingsUserLevelMgmt Server unregister error: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    mAVSettingsUserLevelMgmtServer.Destroy();
 }
 
 static constexpr EndpointId kCameraEndpointId = 1;
diff --git a/examples/chef/common/chef-pump.cpp b/examples/chef/common/chef-pump.cpp
index e5e25583d3b..a6ed26dca15 100644
--- a/examples/chef/common/chef-pump.cpp
+++ b/examples/chef/common/chef-pump.cpp
@@ -19,6 +19,7 @@
 #include "chef-pump.h"
 #include "DeviceTypes.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/endpoint-config-api.h>
@@ -80,7 +81,8 @@ void updateSetPointsOnOff(EndpointId endpointId, bool onOff)
     if (epIndex < kTemperatureMeasurementCount)
     {
         auto updatedTemperature = onOff ? TemperatureRangeMax[epIndex] : chip::app::DataModel::Nullable<int16_t>(0);
-        TemperatureMeasurement::Attributes::MeasuredValue::Set(endpointId, updatedTemperature);
+        LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValue(endpointId, updatedTemperature));
+
         MatterReportingAttributeChangeCallback(endpointId, TemperatureMeasurement::Id,
                                                TemperatureMeasurement::Attributes::MeasuredValue::Id);
     }
@@ -148,7 +150,8 @@ void updateSetPointsLevel(EndpointId endpointId, DataModel::Nullable<uint8_t> le
     {
         DataModel::Nullable<int16_t> updatedTemperature =
             LevelToSetpoint(level, TemperatureRangeMin[epIndex], TemperatureRangeMax[epIndex]);
-        TemperatureMeasurement::Attributes::MeasuredValue::Set(endpointId, updatedTemperature);
+        LogErrorOnFailure(TemperatureMeasurement::SetMeasuredValue(endpointId, updatedTemperature));
+
         MatterReportingAttributeChangeCallback(endpointId, TemperatureMeasurement::Id,
                                                TemperatureMeasurement::Attributes::MeasuredValue::Id);
     }
@@ -281,8 +284,10 @@ void init()
         epIndex = getIndexTemperatureMeasurement(endpointId);
         if (epIndex < kTemperatureMeasurementCount)
         {
-            VerifyOrDieWithMsg(TemperatureMeasurement::Attributes::MeasuredValue::SetNull(endpointId) == Status::Success,
-                               DeviceLayer, "Failed to initialize Temperature Measured Value to NULL for Endpoint: %d", endpointId);
+            DataModel::Nullable<int16_t> temp;
+            CHIP_ERROR err = TemperatureMeasurement::SetMeasuredValue(endpointId, temp);
+            VerifyOrDieWithMsg(err == CHIP_NO_ERROR, DeviceLayer,
+                               "Failed to initialize Temperature Measured Value to NULL for Endpoint: %d", endpointId);
             if (TemperatureMeasurement::Attributes::MinMeasuredValue::Get(endpointId, TemperatureRangeMin[epIndex]) !=
                     Status::Success ||
                 TemperatureRangeMin[epIndex].IsNull())
diff --git a/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter b/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter
index 25d8784c29b..492e601d7ae 100644
--- a/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter
+++ b/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter
@@ -1078,7 +1078,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1682,7 +1681,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1691,6 +1695,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1715,12 +1720,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1747,13 +1759,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1892,7 +1904,7 @@ cluster IcdManagement = 70 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1993,6 +2005,7 @@ endpoint 0 {
     callback attribute upTime;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2107,6 +2120,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.zap b/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.zap
index f2771a7507f..1378ba9db50 100644
--- a/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.zap
+++ b/examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1307,6 +1307,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2740,6 +2756,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 5dfb14b91fb..00f37e008e7 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1321,7 +1321,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1925,7 +1924,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1934,6 +1938,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1958,12 +1963,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1990,13 +2002,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2074,7 +2086,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2171,6 +2183,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2337,6 +2350,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index 341c9b6d7b5..b1b4a72eb1a 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1260,6 +1260,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3456,6 +3472,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
index 33cf98b9e6f..76af10a302e 100644
--- a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
+++ b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
@@ -1281,7 +1281,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1601,7 +1600,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1610,6 +1614,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1634,12 +1639,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1666,13 +1678,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1858,7 +1870,7 @@ cluster FanControl = 514 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1975,6 +1987,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2031,6 +2044,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
index c0424bf1404..33cb9049b1f 100644
--- a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
+++ b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2153,6 +2169,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
index 5e9cfef89e7..7b283bde755 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -1134,7 +1134,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1418,7 +1417,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1427,6 +1431,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1451,12 +1456,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1483,13 +1495,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2729,7 +2741,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2831,6 +2843,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2877,6 +2890,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3242,15 +3256,15 @@ endpoint 3 {
   }
 
   server cluster TemperatureMeasurement {
-    persist  attribute measuredValue default = 0;
+    callback attribute measuredValue;
     persist  attribute minMeasuredValue default = -5000;
     persist  attribute maxMeasuredValue default = 7500;
     persist  attribute tolerance default = 10;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 4 {
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
index 25f4eac463d..9b1872f6604 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
index 1c6e49b38de..358d3ca4ba9 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
@@ -1468,7 +1468,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1788,7 +1787,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1797,6 +1801,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1821,12 +1826,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1853,13 +1865,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2483,7 +2495,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2600,6 +2612,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2656,6 +2669,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2727,15 +2741,15 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    persist  attribute measuredValue default = 0;
+    callback attribute measuredValue;
     persist  attribute minMeasuredValue default = -5000;
     persist  attribute maxMeasuredValue default = 7500;
     persist  attribute tolerance default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster RelativeHumidityMeasurement {
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
index 1997dca838a..6e35ce2baad 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2153,6 +2169,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
index 9f915f33aa2..a5b98aa1ccc 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -1404,7 +1404,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1724,7 +1723,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1733,6 +1737,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1757,12 +1762,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1789,13 +1801,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2427,7 +2439,7 @@ cluster AudioOutput = 1291 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2544,6 +2556,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2601,6 +2614,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index b0758160213..88845aaf244 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 4e93bde4a9e..52828685e9a 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1800,7 +1799,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1809,6 +1813,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1833,12 +1838,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1865,13 +1877,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2203,7 +2215,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2320,6 +2332,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2377,6 +2390,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 76227658ac6..d8c0b8a001f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
index 5e2f0a9aabf..707645bd021 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
@@ -1468,7 +1468,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1788,7 +1787,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1797,6 +1801,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1821,12 +1826,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1853,13 +1865,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2405,7 +2417,7 @@ internal cluster UnitTesting = 4294048773 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2522,6 +2534,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2579,6 +2592,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
index 2ea278af7cf..cecadd0e503 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 44518176ba5..a1b862b857d 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -1564,7 +1564,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1884,7 +1883,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1893,6 +1897,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1917,12 +1922,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1949,13 +1961,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1980,7 +1992,7 @@ cluster BooleanState = 69 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2097,6 +2109,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2154,6 +2167,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 4d8f5602198..aeacd14b3b4 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter
index 2b4db686761..6daccd07c98 100644
--- a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter
@@ -1336,7 +1336,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1656,7 +1655,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1665,6 +1669,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1689,12 +1694,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1721,13 +1733,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2504,7 +2516,7 @@ cluster RadonConcentrationMeasurement = 1071 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2606,6 +2618,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2663,6 +2676,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2827,14 +2841,14 @@ endpoint 4 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 2350;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -27315;
     ram      attribute maxMeasuredValue default = 32767;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 5 {
diff --git a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
index 5c6f117842a..aa7147ee2c6 100644
--- a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1323,6 +1323,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1980,6 +1996,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.matter b/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.matter
index 8a7ad6d21f2..87d9a5f6192 100644
--- a/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.matter
+++ b/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.matter
@@ -1125,7 +1125,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1485,7 +1484,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1494,6 +1498,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1518,12 +1523,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1550,13 +1562,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1607,7 +1619,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1740,6 +1752,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1816,6 +1829,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1904,14 +1918,14 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 6000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 3800;
     ram      attribute maxMeasuredValue default = 26000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.zap b/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.zap
index 2324997b428..394fa3b7e0d 100644
--- a/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.zap
+++ b/examples/chef/devices/rootnode_cooktop_cooksurface_d3c174cc88.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1738,6 +1738,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2703,6 +2719,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 54575549cc1..30a65b78fd3 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1500,7 +1500,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1820,7 +1819,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1829,6 +1833,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1853,12 +1858,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1885,13 +1897,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1969,7 +1981,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2088,6 +2100,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2145,6 +2158,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 624032c83b9..2cf61e177f0 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1536,6 +1536,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2193,6 +2209,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
index 3a31da7f5f4..cf607c0853d 100644
--- a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
+++ b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
@@ -1500,7 +1500,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1820,7 +1819,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1829,6 +1833,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1853,12 +1858,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1885,13 +1897,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2123,7 +2135,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2240,6 +2252,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2296,6 +2309,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
index 4f77e50169b..a7c0fc8eabd 100644
--- a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
+++ b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1512,6 +1512,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index f86c5676b29..5efc2e3797f 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -1125,7 +1125,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1485,7 +1484,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1494,6 +1498,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1518,12 +1523,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1550,13 +1562,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1757,7 +1769,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1889,6 +1901,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1967,6 +1980,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index ae32c6e0d73..81b66c31aab 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1731,6 +1731,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2720,6 +2736,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 827649bbac6..c1e39447957 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -1468,7 +1468,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1788,7 +1787,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1797,6 +1801,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1821,12 +1826,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1853,13 +1865,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2515,7 +2527,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2634,6 +2646,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2691,6 +2704,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index c04a51f892b..ffa2556d9c1 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1527,6 +1527,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2184,6 +2200,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index f5b513a1b89..41220916017 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1500,7 +1500,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1820,7 +1819,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1829,6 +1833,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1853,12 +1858,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1885,13 +1897,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2223,7 +2235,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2340,6 +2352,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2397,6 +2410,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index befda751bb7..ade52ed240e 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_extractorhood_0359bf807d.matter b/examples/chef/devices/rootnode_extractorhood_0359bf807d.matter
index 20dcdb751bc..199326f3c8a 100644
--- a/examples/chef/devices/rootnode_extractorhood_0359bf807d.matter
+++ b/examples/chef/devices/rootnode_extractorhood_0359bf807d.matter
@@ -1149,7 +1149,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1469,7 +1468,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1478,6 +1482,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1502,12 +1507,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1534,13 +1546,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1823,7 +1835,7 @@ cluster FanControl = 514 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1939,6 +1951,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2000,6 +2013,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/chef/devices/rootnode_extractorhood_0359bf807d.zap b/examples/chef/devices/rootnode_extractorhood_0359bf807d.zap
index db0d79950fc..c11b786903d 100644
--- a/examples/chef/devices/rootnode_extractorhood_0359bf807d.zap
+++ b/examples/chef/devices/rootnode_extractorhood_0359bf807d.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1629,6 +1629,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2379,6 +2395,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index ee4be2e480c..cbedbdf5791 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -1357,7 +1357,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1677,7 +1676,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1686,6 +1690,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1710,12 +1715,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1742,13 +1754,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1834,7 +1846,7 @@ cluster FanControl = 514 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1951,6 +1963,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2008,6 +2021,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index f06be3c7fd6..0692f54b183 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 060b20b6fa1..b7913d249de 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1717,7 +1729,7 @@ cluster FlowMeasurement = 1028 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1834,6 +1846,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1891,6 +1904,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index a426efafc4e..2782f1bc748 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
index 88e795a5d5a..c2eca242d5b 100644
--- a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
+++ b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1655,7 +1654,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1664,6 +1668,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1688,12 +1693,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1720,18 +1732,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1833,6 +1845,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1879,6 +1892,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
index 852deafe11b..df8696be5d7 100644
--- a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
+++ b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
index 9462b569ff6..c96ee787fe6 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1655,7 +1654,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1664,6 +1668,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1688,12 +1693,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1720,18 +1732,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1833,6 +1845,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1879,6 +1892,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
index 5cc87549293..b7701a835fb 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter
index b9b26b86ac5..55362b8db10 100644
--- a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter
+++ b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,13 +1677,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2630,7 +2642,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2727,6 +2739,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2781,6 +2794,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2925,14 +2939,14 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 6000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0;
     ram      attribute maxMeasuredValue default = 90;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
@@ -2965,14 +2979,14 @@ endpoint 3 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 4000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0;
     ram      attribute maxMeasuredValue default = 90;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
index bc858f8d7bd..aa09ae23197 100644
--- a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
+++ b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1329,6 +1329,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -1997,6 +2013,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 004fe3b2d77..2efab28ba2b 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1717,7 +1729,7 @@ cluster RelativeHumidityMeasurement = 1029 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1834,6 +1846,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1891,6 +1904,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 046b55fdf11..e5d0ffb0ea5 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter b/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter
index c738d878af7..7189f43de79 100644
--- a/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter
+++ b/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter
@@ -1125,7 +1125,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1485,7 +1484,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1494,6 +1498,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1518,12 +1523,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1550,13 +1562,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1657,7 +1669,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1789,6 +1801,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1867,6 +1880,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap b/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
index 5b3a32cad34..0f583ec489c 100644
--- a/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
+++ b/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1731,6 +1731,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2720,6 +2736,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
index b58cce3d4df..abcbf59a5ac 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -1060,7 +1060,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1420,7 +1419,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1429,6 +1433,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1453,12 +1458,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1485,13 +1497,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1672,7 +1684,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1794,6 +1806,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1872,6 +1885,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
index ba75f904bec..1400107f20d 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1609,6 +1609,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2598,6 +2614,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 371aecafe8b..33813f27607 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1723,7 +1735,7 @@ cluster IlluminanceMeasurement = 1024 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1840,6 +1852,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1897,6 +1910,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index ceae9083545..aa3a67a868b 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_microwaveoven_37420684d3.matter b/examples/chef/devices/rootnode_microwaveoven_37420684d3.matter
index 1c5e7241c38..86029bc11fd 100644
--- a/examples/chef/devices/rootnode_microwaveoven_37420684d3.matter
+++ b/examples/chef/devices/rootnode_microwaveoven_37420684d3.matter
@@ -1133,7 +1133,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1453,7 +1452,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1462,6 +1466,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1486,12 +1491,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1518,13 +1530,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1694,7 +1706,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1798,6 +1810,7 @@ endpoint 0 {
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1852,6 +1865,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_microwaveoven_37420684d3.zap b/examples/chef/devices/rootnode_microwaveoven_37420684d3.zap
index cd9ecbcf992..5cc0b84258b 100644
--- a/examples/chef/devices/rootnode_microwaveoven_37420684d3.zap
+++ b/examples/chef/devices/rootnode_microwaveoven_37420684d3.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1389,6 +1389,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2014,6 +2030,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.matter b/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.matter
index 7d1f6124f08..cb403f2409d 100644
--- a/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.matter
+++ b/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.matter
@@ -1403,7 +1403,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1723,7 +1722,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1732,6 +1736,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1756,12 +1761,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1788,18 +1800,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1916,6 +1928,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1984,6 +1997,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.zap b/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.zap
index 01448b3e37b..9fdd6ed3309 100644
--- a/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.zap
+++ b/examples/chef/devices/rootnode_mounteddimmableloadcontrol_a9a1a87f2d.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1605,6 +1605,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2446,6 +2462,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.matter b/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.matter
index 3926d21bdc2..914e2314f0e 100644
--- a/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.matter
+++ b/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.matter
@@ -1280,7 +1280,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,18 +1677,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1793,6 +1805,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1861,6 +1874,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.zap b/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.zap
index eaffda9444f..203fe2d9049 100644
--- a/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.zap
+++ b/examples/chef/devices/rootnode_mountedonoffcontrol_ec30c757a6.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1605,6 +1605,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2446,6 +2462,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 781626db5d3..8cfbc25456f 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1775,7 +1787,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1892,6 +1904,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1949,6 +1962,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index b425cf7cc98..b9d6034a480 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 03132d14284..3b3f8fb6709 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -1500,7 +1500,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1820,7 +1819,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1829,6 +1833,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1853,12 +1858,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1885,18 +1897,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2013,6 +2025,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2070,6 +2083,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2080,7 +2094,7 @@ endpoint 0 {
   }
 }
 endpoint 13 {
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
   binding cluster Binding;
 
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index f6bf2f75226..6fc4fef3f00 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -2217,7 +2249,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        4
       ],
       "deviceIdentifiers": [
         256
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter
index a9ca94494bf..887fdb042bd 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -1500,7 +1500,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1820,7 +1819,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1829,6 +1833,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1853,12 +1858,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1885,13 +1897,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1927,7 +1939,7 @@ cluster SampleMei = 4294048800 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2044,6 +2056,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2101,6 +2114,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2111,7 +2125,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
   binding cluster Binding;
 
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap
index 6b8f0b47494..fa9fce048a3 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.zap
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -2217,7 +2249,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        4
       ],
       "deviceIdentifiers": [
         256
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index 6915a272a8a..02e94a1083a 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -1377,7 +1377,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1697,7 +1696,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1706,6 +1710,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1730,12 +1735,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1762,18 +1774,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1890,6 +1902,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1947,6 +1960,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 7135cd6562c..ee8ae948ef3 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index d0e8172b2ae..37b5a3ecacb 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -1377,7 +1377,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1697,7 +1696,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1706,6 +1710,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1730,12 +1735,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1762,18 +1774,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1890,6 +1902,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1947,6 +1960,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 655b057ba49..f47ff1dc821 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.matter b/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.matter
index 66c1b7afbe1..f7b110f0a88 100644
--- a/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.matter
+++ b/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.matter
@@ -1125,7 +1125,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1485,7 +1484,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1494,6 +1498,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1518,12 +1523,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1550,13 +1562,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1730,7 +1742,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1860,6 +1872,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1938,6 +1951,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2037,14 +2051,14 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 6555;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 3000;
     ram      attribute maxMeasuredValue default = 30000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
@@ -2127,14 +2141,14 @@ endpoint 4 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.zap b/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.zap
index e412051faf0..0fac5cd332f 100644
--- a/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.zap
+++ b/examples/chef/devices/rootnode_oven_temperaturecontrolledcabinet_cooktop_cooksurface_738dd18832.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1699,6 +1699,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2688,6 +2704,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 9d9da377a39..a73bbdcc041 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1743,7 +1755,7 @@ cluster PressureMeasurement = 1027 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1860,6 +1872,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1917,6 +1930,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index e57018b987d..daaf4708630 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
index 76bcd1aa28c..b9d396573a1 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -1232,7 +1232,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1516,7 +1515,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1525,6 +1529,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1549,12 +1554,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1581,13 +1593,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1769,7 +1781,7 @@ cluster FlowMeasurement = 1028 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1873,6 +1885,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1928,6 +1941,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2020,14 +2034,14 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 6000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 100;
     ram      attribute maxMeasuredValue default = 9000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap
index 427b66f1840..e5bff284e3b 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.zap
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1417,6 +1417,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2093,6 +2109,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter b/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter
index 01168fecb69..6f6dc4cf108 100644
--- a/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter
+++ b/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,13 +1677,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1754,7 +1766,7 @@ cluster BooleanStateConfiguration = 128 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1854,6 +1866,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1899,6 +1912,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap b/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap
index 0d83f42ed37..666608f0138 100644
--- a/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap
+++ b/examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1291,6 +1291,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1824,6 +1840,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
index 2da53f51d4b..98bb10e428f 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -989,7 +989,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1349,7 +1348,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1358,6 +1362,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1382,12 +1387,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1414,13 +1426,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1547,7 +1559,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1669,6 +1681,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1747,6 +1760,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1828,14 +1842,14 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 200;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -4000;
     ram      attribute maxMeasuredValue default = 2000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
@@ -1870,14 +1884,14 @@ endpoint 3 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = -1800;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -4000;
     ram      attribute maxMeasuredValue default = 2000;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
index 02589da0d98..2df7649be85 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1609,6 +1609,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2598,6 +2614,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index b00c787e044..1bf66e249d5 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -1392,7 +1392,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1676,7 +1675,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1685,6 +1689,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1709,12 +1714,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1741,13 +1753,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1965,7 +1977,7 @@ cluster RvcOperationalState = 97 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2067,6 +2079,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2113,6 +2126,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 8fbfea25031..b7905c486fc 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index 1c72a4d276b..83c4a1ec3d8 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -1205,7 +1205,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1489,7 +1488,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1498,6 +1502,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1522,12 +1527,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1554,13 +1566,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2144,7 +2156,7 @@ cluster RelativeHumidityMeasurement = 1029 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -2246,6 +2258,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2292,6 +2305,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2443,14 +2457,14 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 2800;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 1500;
     ram      attribute maxMeasuredValue default = 4500;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index 3b9de7f1124..d44b31a5c26 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
index 98b81698569..a3ac86db8a5 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -1392,7 +1392,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1676,7 +1675,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1685,6 +1689,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1709,12 +1714,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1741,19 +1753,19 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 cluster SmokeCoAlarm = 92 {
-  revision 1;
+  revision 2;
 
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
@@ -1783,6 +1795,7 @@ cluster SmokeCoAlarm = 92 {
     kEndOfService = 6;
     kInterconnectSmoke = 7;
     kInterconnectCO = 8;
+    kInoperative = 9;
   }
 
   enum MuteStateEnum : enum8 {
@@ -1852,6 +1865,7 @@ cluster SmokeCoAlarm = 92 {
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
   attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
+  provisional readonly attribute optional boolean unmounted = 13;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1863,7 +1877,7 @@ cluster SmokeCoAlarm = 92 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1965,6 +1979,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2011,6 +2026,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2107,6 +2123,7 @@ endpoint 1 {
     ram      attribute contaminationState default = 0;
     ram      attribute smokeSensitivityLevel default = 1;
     ram      attribute expiryDate default = 0;
+    ram      attribute unmounted default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
index 45b5749db2e..25b014b38ce 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1315,6 +1315,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1856,6 +1872,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -2849,6 +2881,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "Unmounted",
+              "code": 13,
+              "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": "GeneratedCommandList",
               "code": 65528,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index e5efaa4e36f..6e1c040e082 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -1424,7 +1424,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1744,7 +1743,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1753,6 +1757,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1777,12 +1782,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1809,18 +1821,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1937,6 +1949,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1994,6 +2007,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 0ec1bfdf49a..7b4a5ba9343 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 1c7e600c2b7..d7519aaf49e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1717,7 +1729,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1834,6 +1846,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1891,6 +1904,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1931,14 +1945,14 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 2350;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -27315;
     ram      attribute maxMeasuredValue default = 32767;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 0b5afdb682d..5c5b5b57c4e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index c06d4a25801..9019e8ca0d4 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1322,7 +1322,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1642,7 +1641,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1651,6 +1655,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1675,12 +1680,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1707,13 +1719,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2370,7 +2382,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2494,6 +2506,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2551,6 +2564,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 5305e4deaa0..a49c93bd697 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1578,6 +1578,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2235,6 +2251,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.matter b/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.matter
index 356871234ce..e4ca4ea0ed6 100644
--- a/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.matter
+++ b/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,13 +1677,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1754,7 +1766,7 @@ cluster BooleanStateConfiguration = 128 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1854,6 +1866,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1899,6 +1912,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.zap b/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.zap
index 0c65a00f267..8bdf0c28b44 100644
--- a/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.zap
+++ b/examples/chef/devices/rootnode_waterfreezedetector_dd94a13a16.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1291,6 +1291,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1824,6 +1840,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
index fbe6613be09..bba6a316ae7 100644
--- a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
+++ b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
@@ -1392,7 +1392,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1676,7 +1675,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1685,6 +1689,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1709,12 +1714,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1741,13 +1753,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1830,7 +1842,7 @@ cluster BooleanStateConfiguration = 128 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1932,6 +1944,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1978,6 +1991,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
index 0047f7a8e4f..213190002db 100644
--- a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
+++ b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1323,6 +1323,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1864,6 +1880,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
index 6be80dc2d28..db051021919 100644
--- a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
+++ b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,13 +1677,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1741,7 +1753,7 @@ cluster ValveConfigurationAndControl = 129 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1843,6 +1855,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1889,6 +1902,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
index 4a19b68c91f..5c52fa79ee4 100644
--- a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
+++ b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1323,6 +1323,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1864,6 +1880,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 946db88989c..678eb8c6a92 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -1306,7 +1306,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1626,7 +1625,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1635,6 +1639,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1659,12 +1664,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1691,13 +1703,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1854,7 +1866,7 @@ cluster WindowCovering = 258 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1971,6 +1983,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2028,6 +2041,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 07b704f6805..5d772dbfdef 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1504,6 +1504,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2161,6 +2177,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap
index 681a0219b66..2aef84fdebc 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1323,6 +1323,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1864,6 +1880,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
index 8e37b76513b..a9f416750e0 100644
--- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap
+++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
@@ -52,7 +52,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1657,6 +1657,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3895,6 +3911,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
index 4c19ca0d627..74d713d85c5 100644
--- a/examples/chip-tool/BUILD.gn
+++ b/examples/chip-tool/BUILD.gn
@@ -28,10 +28,6 @@ import("${chip_root}/src/crypto/crypto.gni")
 
 assert(chip_build_tools)
 
-# Thread Commissioner is using newer version of mbedtls
-_enable_thread_meshcop = chip_device_platform == "linux" &&
-                         chip_enable_ot_commissioner && chip_crypto != "mbedtls"
-
 config("config") {
   include_dirs = [
     ".",
@@ -55,12 +51,6 @@ config("config") {
     defines += [ "CONFIG_ENABLE_HTTPS_REQUESTS" ]
   }
 
-  if (_enable_thread_meshcop) {
-    defines += [ "CHIP_ENABLE_OT_COMMISSIONER=1" ]
-  } else {
-    defines += [ "CHIP_ENABLE_OT_COMMISSIONER=0" ]
-  }
-
   cflags = [ "-Wconversion" ]
 }
 
@@ -155,11 +145,6 @@ static_library("chip-tool-utils") {
         [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ]
   }
 
-  if (_enable_thread_meshcop) {
-    sources += [ "commands/pairing/CommissionProxy.cpp" ]
-    public_deps += [ "${chip_root}/third_party/ot-commissioner" ]
-  }
-
   output_dir = root_out_dir
 }
 
diff --git a/examples/chip-tool/args.gni b/examples/chip-tool/args.gni
index 30f4000365e..9c163f1cabd 100644
--- a/examples/chip-tool/args.gni
+++ b/examples/chip-tool/args.gni
@@ -31,3 +31,4 @@ matter_log_json_payload_decode_full = true
 # make chip-tool very strict by default
 chip_tlv_validate_char_string_on_read = true
 chip_tlv_validate_char_string_on_write = true
+chip_support_thread_meshcop = true
diff --git a/examples/chip-tool/chip-tool.gni b/examples/chip-tool/chip-tool.gni
index 743164c8a5b..0bc5dcbb5cb 100644
--- a/examples/chip-tool/chip-tool.gni
+++ b/examples/chip-tool/chip-tool.gni
@@ -22,7 +22,4 @@ declare_args() {
   config_enable_yaml_tests = true
   config_use_local_storage = true
   config_enable_https_requests = true
-
-  # Disable OpenThread Commissioner if cross-compiling by default.
-  chip_enable_ot_commissioner = current_cpu == host_cpu && current_os == host_os
 }
diff --git a/examples/chip-tool/commands/group/Commands.h b/examples/chip-tool/commands/group/Commands.h
index b29ff959ede..d924c6ab923 100644
--- a/examples/chip-tool/commands/group/Commands.h
+++ b/examples/chip-tool/commands/group/Commands.h
@@ -23,6 +23,7 @@
 #include "commands/common/CHIPCommand.h"
 #include "commands/common/Command.h"
 #include "commands/common/Commands.h"
+#include <clusters/Groupcast/Enums.h>
 
 class ShowControllerGroups : public CHIPCommand
 {
@@ -88,6 +89,7 @@ class AddGroup : public CHIPCommand
     {
         AddArgument("groupName", &groupName);
         AddArgument("groupId", chip::kUndefinedGroupId, UINT16_MAX, &groupId);
+        AddArgument("addressPolicy", 0, 1, &addressPolicy);
     }
     chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(20); }
 
@@ -104,6 +106,12 @@ class AddGroup : public CHIPCommand
 
         group.SetName(groupName);
         group.group_id = groupId;
+        group.flags    = 0;
+        if (!addressPolicy.HasValue() ||
+            (chip::to_underlying(chip::app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup) == addressPolicy.Value()))
+        {
+            group.flags |= static_cast<uint8_t>(chip::Credentials::GroupDataProvider::GroupInfo::Flags::kMcastAddrPolicy);
+        }
         ReturnErrorOnFailure(groupDataProvider->SetGroupInfo(fabricIndex, group));
 
         SetCommandExitStatus(CHIP_NO_ERROR);
@@ -113,6 +121,7 @@ class AddGroup : public CHIPCommand
 private:
     char * groupName;
     chip::GroupId groupId;
+    chip::Optional<uint8_t> addressPolicy;
 };
 
 class RemoveGroup : public CHIPCommand
diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h
index 55c51389c1a..3a046867670 100644
--- a/examples/chip-tool/commands/pairing/Commands.h
+++ b/examples/chip-tool/commands/pairing/Commands.h
@@ -53,6 +53,16 @@ class PairCodePase : public PairingCommand
     {}
 };
 
+#if CHIP_SUPPORT_THREAD_MESHCOP
+class PairThreadMeshcop : public PairingCommand
+{
+public:
+    PairThreadMeshcop(CredentialIssuerCommands * credsIssuerConfig) :
+        PairingCommand("thread-meshcop", PairingMode::ThreadMeshcop, PairingNetworkType::Thread, credsIssuerConfig)
+    {}
+};
+#endif
+
 class PairCodeWifi : public PairingCommand
 {
 public:
@@ -277,6 +287,9 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre
         make_unique<PairSoftAP>(credsIssuerConfig),
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
         make_unique<PairWiFiPAF>(credsIssuerConfig),
+#endif
+#if CHIP_SUPPORT_THREAD_MESHCOP
+        make_unique<PairThreadMeshcop>(credsIssuerConfig),
 #endif
         make_unique<PairAlreadyDiscovered>(credsIssuerConfig),
         make_unique<PairAlreadyDiscoveredByIndex>(credsIssuerConfig),
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
index cc6ad468a7d..9fba19dd8ff 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.cpp
+++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -106,13 +106,6 @@ CHIP_ERROR PairingCommand::RunInternal(NodeId remoteId)
         err = Unpair(remoteId);
         break;
     case PairingMode::Code:
-#if CHIP_ENABLE_OT_COMMISSIONER
-        if (mThreadBaHost.HasValue() && mThreadBaPort.HasValue())
-        {
-            err = PairWithMeshCoP();
-            break;
-        }
-#endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
         chip::DeviceLayer::ConnectivityMgr().WiFiPafSetApFreq(
             mApFreqStr.HasValue() ? static_cast<uint16_t>(std::stol(mApFreqStr.Value())) : 0);
@@ -148,6 +141,17 @@ CHIP_ERROR PairingCommand::RunInternal(NodeId remoteId)
             mApFreqStr.HasValue() ? static_cast<uint16_t>(std::stol(mApFreqStr.Value())) : 0);
         err = Pair(remoteId, PeerAddress::WiFiPAF(remoteId));
         break;
+#endif
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    case PairingMode::ThreadMeshcop: {
+        Inet::IPAddress ipAddr;
+
+        VerifyOrReturnError(mThreadBaHost.HasValue(), CHIP_ERROR_INVALID_ARGUMENT);
+        VerifyOrReturnError(mThreadBaPort.HasValue(), CHIP_ERROR_INVALID_ARGUMENT);
+        VerifyOrReturnError(Inet::IPAddress::FromString(mThreadBaHost.Value(), ipAddr), CHIP_ERROR_INVALID_ADDRESS);
+        err = Pair(remoteId, PeerAddress::ThreadMeshcop(ipAddr, mThreadBaPort.Value()));
+        break;
+    }
 #endif
     case PairingMode::AlreadyDiscovered:
         err = Pair(remoteId, PeerAddress::UDP(mRemoteAddr.address, mRemotePort, mRemoteAddr.interfaceId));
@@ -303,12 +307,37 @@ CHIP_ERROR PairingCommand::PairWithCode(NodeId remoteId)
 
 CHIP_ERROR PairingCommand::Pair(NodeId remoteId, PeerAddress address)
 {
-    VerifyOrDieWithMsg(mSetupPINCode.has_value(), chipTool, "Using mSetupPINCode in a mode when we have not gotten one");
-    auto params = RendezvousParameters().SetSetupPINCode(mSetupPINCode.value()).SetPeerAddress(address);
-    if (mDiscriminator.has_value())
+    auto params = RendezvousParameters().SetPeerAddress(address);
+    if (mOnboardingPayload != nullptr)
+    {
+        SetupPayload payload;
+
+        ReturnErrorOnFailure(ParseSetupPayload(payload, mOnboardingPayload));
+        params.SetSetupPINCode(payload.setUpPINCode);
+        params.SetSetupDiscriminator(payload.discriminator);
+    }
+    else
+    {
+        VerifyOrDieWithMsg(mSetupPINCode.has_value(), chipTool, "Using mSetupPINCode in a mode when we have not gotten one");
+        params.SetSetupPINCode(mSetupPINCode.value());
+        if (mDiscriminator.has_value())
+        {
+            params.SetDiscriminator(mDiscriminator.value());
+        }
+    }
+
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    if (address.GetTransportType() == Transport::Type::kThreadMeshcop)
     {
-        params.SetDiscriminator(mDiscriminator.value());
+        CurrentCommissioner().RegisterDeviceDiscoveryDelegate(this);
+        CommissioningParameters commissioningParams = GetCommissioningParameters();
+
+        commissioningParams.SetThreadOperationalDataset(mOperationalDataset);
+        auto error = CurrentCommissioner().PairDevice(remoteId, params, commissioningParams);
+        CurrentCommissioner().RegisterDeviceDiscoveryDelegate(nullptr);
+        return error;
     }
+#endif // CHIP_SUPPORT_THREAD_MESHCOP
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     if (mPaseOnly.ValueOr(false))
@@ -419,57 +448,6 @@ CHIP_ERROR PairingCommand::PairWithMdns(NodeId remoteId)
     return CurrentCommissioner().DiscoverCommissionableNodes(filter);
 }
 
-#if CHIP_ENABLE_OT_COMMISSIONER
-CHIP_ERROR PairingCommand::PairWithMeshCoP()
-{
-    SetupPayload payload;
-
-    ReturnErrorOnFailure(ParseSetupPayload(payload, mOnboardingPayload));
-
-    if (payload.rendezvousInformation.HasValue() && !payload.rendezvousInformation.Value().Has(RendezvousInformationFlag::kThread))
-    {
-        // Proceed even if the device doesn't claim rendezvous over Thread MeshCoP because in-market devices may not
-        // be able to update their QR Code.
-        ChipLogProgress(chipTool, "WARNING: device may not support commissioning over Thread meshcop");
-    }
-
-    mSetupPINCode.emplace(payload.setUpPINCode);
-
-    Thread::DiscoveryCode code;
-    if (payload.discriminator.IsShortDiscriminator())
-    {
-        code = Thread::DiscoveryCode(payload.discriminator.GetShortValue());
-        ChipLogProgress(chipTool, "Discovery code from short discriminator: 0x%" PRIx64, code.AsUInt64());
-    }
-    else
-    {
-        code = Thread::DiscoveryCode(payload.discriminator.GetLongValue());
-        ChipLogProgress(chipTool, "Discovery code from long discriminator: 0x%" PRIx64, code.AsUInt64());
-    }
-
-    uint8_t pskc[Thread::kSizePSKc];
-
-    {
-        Thread::OperationalDatasetView dataset;
-        ReturnErrorAndLogOnFailure(dataset.Init(mOperationalDataset), chipTool, "Failed to parse Thread dataset");
-
-        ReturnErrorAndLogOnFailure(dataset.GetPSKc(pskc), chipTool, "Failed to retrieve PSKc");
-    }
-
-    {
-        Dnssd::DiscoveredNodeData discoveredNodeData;
-        ReturnErrorOnFailure(mCommissionProxy.Discover(pskc, mThreadBaHost.Value(), mThreadBaPort.Value(), code,
-                                                       payload.discriminator, discoveredNodeData, mTimeout.ValueOr(30)));
-
-        CurrentCommissioner().RegisterDeviceDiscoveryDelegate(this);
-        CurrentCommissioner().OnNodeDiscovered(discoveredNodeData);
-    }
-
-    ChipLogProgress(chipTool, "Joiner discovered");
-    return CHIP_NO_ERROR;
-}
-#endif // CHIP_ENABLE_OT_COMMISSIONER
-
 CHIP_ERROR PairingCommand::Unpair(NodeId remoteId)
 {
     mCurrentFabricRemover = Platform::MakeUnique<Controller::CurrentFabricRemover>(&CurrentCommissioner());
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h
index 86ffbbd12ff..b50201dadb2 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.h
+++ b/examples/chip-tool/commands/pairing/PairingCommand.h
@@ -19,9 +19,6 @@
 #pragma once
 
 #include "../common/CHIPCommand.h"
-#if CHIP_ENABLE_OT_COMMISSIONER
-#include "CommissionProxy.h"
-#endif
 #include <controller/CommissioningDelegate.h>
 #include <controller/CurrentFabricRemover.h>
 
@@ -47,6 +44,9 @@ enum class PairingMode
     AlreadyDiscoveredByIndexWithCode,
     OnNetwork,
     Nfc,
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    ThreadMeshcop,
+#endif
 };
 
 enum class PairingNetworkType
@@ -109,6 +109,12 @@ class PairingCommand : public CHIPCommand,
         {
         case PairingMode::None:
             break;
+#if CHIP_SUPPORT_THREAD_MESHCOP
+        case PairingMode::ThreadMeshcop:
+            AddArgument("thread-ba-host", &mThreadBaHost, "Thread Border Agent host");
+            AddArgument("thread-ba-port", 0, UINT16_MAX, &mThreadBaPort, "Thread Border Agent port");
+            FALLTHROUGH;
+#endif
         case PairingMode::Code:
             AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete);
             AddArgument("dcl-hostname", &mDCLHostName,
@@ -119,10 +125,6 @@ class PairingCommand : public CHIPCommand,
         case PairingMode::CodePaseOnly:
             AddArgument("payload", &mOnboardingPayload);
             AddArgument("discover-once", 0, 1, &mDiscoverOnce);
-#if CHIP_ENABLE_OT_COMMISSIONER
-            AddArgument("thread-ba-host", &mThreadBaHost, "Thread Border Agent host");
-            AddArgument("thread-ba-port", 0, UINT16_MAX, &mThreadBaPort, "Thread Border Agent port");
-#endif
             AddArgument("use-only-onnetwork-discovery", 0, 1, &mUseOnlyOnNetworkDiscovery,
                         "Whether to only use DNS-SD for discovery. The default is true if no network credentials are provided, "
                         "false otherwise.");
@@ -270,9 +272,6 @@ class PairingCommand : public CHIPCommand,
     CHIP_ERROR RunInternal(NodeId remoteId);
     CHIP_ERROR Pair(NodeId remoteId, PeerAddress address);
     CHIP_ERROR PairWithMdns(NodeId remoteId);
-#if CHIP_ENABLE_OT_COMMISSIONER
-    CHIP_ERROR PairWithMeshCoP();
-#endif
     CHIP_ERROR PairWithCode(NodeId remoteId);
     CHIP_ERROR PaseWithCode(NodeId remoteId);
     CHIP_ERROR PairWithMdnsOrBleByIndex(NodeId remoteId, uint16_t index);
@@ -341,10 +340,9 @@ class PairingCommand : public CHIPCommand,
     static void OnCurrentFabricRemove(void * context, NodeId remoteNodeId, CHIP_ERROR status);
     void PersistIcdInfo();
 
-#if CHIP_ENABLE_OT_COMMISSIONER
+#if CHIP_SUPPORT_THREAD_MESHCOP
     chip::Optional<char *> mThreadBaHost;
     chip::Optional<uint16_t> mThreadBaPort;
-    CommissionProxy mCommissionProxy;
 #endif
 
     std::optional<std::thread> mPrompterThread;
diff --git a/examples/closure-app/closure-common/closure-app.matter b/examples/closure-app/closure-common/closure-app.matter
index 5b49c03c4f1..119240f9562 100644
--- a/examples/closure-app/closure-common/closure-app.matter
+++ b/examples/closure-app/closure-common/closure-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1768,7 +1767,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1777,6 +1781,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1801,12 +1806,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1833,13 +1845,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2202,7 +2214,7 @@ provisional cluster ClosureDimension = 261 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2326,6 +2338,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2498,6 +2511,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/closure-app/closure-common/closure-app.zap b/examples/closure-app/closure-common/closure-app.zap
index c37ba2ad7b7..a4836bf5edc 100644
--- a/examples/closure-app/closure-common/closure-app.zap
+++ b/examples/closure-app/closure-common/closure-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        4
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1701,6 +1701,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4023,6 +4039,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/closure-app/silabs/data_model/closure-thread-app.matter b/examples/closure-app/silabs/data_model/closure-thread-app.matter
index b70960424b1..addb9ef9fdc 100644
--- a/examples/closure-app/silabs/data_model/closure-thread-app.matter
+++ b/examples/closure-app/silabs/data_model/closure-thread-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1651,7 +1650,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1660,6 +1664,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1684,12 +1689,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1716,13 +1728,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2085,7 +2097,7 @@ provisional cluster ClosureDimension = 261 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2209,6 +2221,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2344,6 +2357,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/closure-app/silabs/data_model/closure-thread-app.zap b/examples/closure-app/silabs/data_model/closure-thread-app.zap
index 0d6199b8dfc..0da6f9611ad 100644
--- a/examples/closure-app/silabs/data_model/closure-thread-app.zap
+++ b/examples/closure-app/silabs/data_model/closure-thread-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        4
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1701,6 +1701,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3554,6 +3570,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/closure-app/silabs/data_model/closure-wifi-app.matter b/examples/closure-app/silabs/data_model/closure-wifi-app.matter
index 29e777d6ac0..578a86a3d91 100644
--- a/examples/closure-app/silabs/data_model/closure-wifi-app.matter
+++ b/examples/closure-app/silabs/data_model/closure-wifi-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1560,7 +1559,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1569,6 +1573,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1593,12 +1598,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1625,13 +1637,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1994,7 +2006,7 @@ provisional cluster ClosureDimension = 261 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2118,6 +2130,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2206,6 +2219,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/closure-app/silabs/data_model/closure-wifi-app.zap b/examples/closure-app/silabs/data_model/closure-wifi-app.zap
index b14a842424d..f809186c3a5 100644
--- a/examples/closure-app/silabs/data_model/closure-wifi-app.zap
+++ b/examples/closure-app/silabs/data_model/closure-wifi-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        4
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1701,6 +1701,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2777,6 +2793,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/closure-app/silabs/src/ClosureManager.cpp b/examples/closure-app/silabs/src/ClosureManager.cpp
index 51cf3364e62..4897f3e8e81 100644
--- a/examples/closure-app/silabs/src/ClosureManager.cpp
+++ b/examples/closure-app/silabs/src/ClosureManager.cpp
@@ -123,7 +123,10 @@ void ClosureManager::Init()
     if (pTestEventDelegate != nullptr)
     {
         CHIP_ERROR err = pTestEventDelegate->AddHandler(&mClosureEndpoint1.GetDelegate());
-        ChipLogFailure(err, AppServer, "Failed to add handler for delegate");
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(AppServer, "Failed to add handler for delegate: %" CHIP_ERROR_FORMAT, err.Format());
+        }
     }
     else
     {
diff --git a/examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp b/examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp
index eea5a730874..3775c8258c4 100644
--- a/examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp
+++ b/examples/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp
@@ -95,8 +95,6 @@ void app_pds_fastboot_done_callback(void)
 
     bl_psram_init();
 
-    // app_pds_config_pin();
-
     app_pds_wakeup_source = bl_pds_get_wakeup_source();
     app_pds_wakeup_pin    = bl_pds_get_wakeup_gpio();
 }
@@ -107,6 +105,7 @@ int app_pds_before_sleep_callback(void)
     {
         bl_pds_set_psram_retention(1);
         lmac154_sleepStoreRegs(low_power_pds_lmac154_backup);
+        L1C_Cache_Flush();
 
         return 0;
     }
@@ -125,6 +124,7 @@ void app_pds_after_sleep_callback(void)
 
         zb_timer_restore_events(true);
 
+        lmac154_enableCoex();
         bl_irq_enable(M154_IRQn);
     }
     bl_sec_init();
diff --git a/examples/contact-sensor-app/bouffalolab/bl702l/args.gni b/examples/contact-sensor-app/bouffalolab/bl702l/args.gni
index 2720935eb60..50a62a09c3b 100644
--- a/examples/contact-sensor-app/bouffalolab/bl702l/args.gni
+++ b/examples/contact-sensor-app/bouffalolab/bl702l/args.gni
@@ -21,7 +21,7 @@ bl_iot_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_detail_logging = false
 is_debug = false
-chip_progress_logging = true
+chip_progress_logging = false
 chip_error_logging = true
 
 chip_enable_icd_server = true
diff --git a/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp b/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp
index a23a5d46e18..8604498afd7 100644
--- a/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp
+++ b/examples/contact-sensor-app/bouffalolab/common/AppTask.cpp
@@ -73,7 +73,7 @@ void AppTask::AppShellTask(void * args)
     Shell::Engine::Root().RunMainLoop();
 }
 
-CHIP_ERROR AppTask::StartAppShellTask()
+void AppTask::StartAppShellTask()
 {
     static TaskHandle_t shellTask;
 
@@ -82,8 +82,6 @@ CHIP_ERROR AppTask::StartAppShellTask()
     cmd_misc_init();
 
     xTaskCreate(AppTask::AppShellTask, "chip_shell", 1024 / sizeof(configSTACK_DEPTH_TYPE), NULL, APP_TASK_PRIORITY, &shellTask);
-
-    return CHIP_NO_ERROR;
 }
 #endif
 
diff --git a/examples/contact-sensor-app/bouffalolab/common/AppTask.h b/examples/contact-sensor-app/bouffalolab/common/AppTask.h
index 92b3ba7c45d..b28442ced6c 100644
--- a/examples/contact-sensor-app/bouffalolab/common/AppTask.h
+++ b/examples/contact-sensor-app/bouffalolab/common/AppTask.h
@@ -107,7 +107,7 @@ class AppTask
     static void AppTaskMain(void * pvParameter);
 
 #if CONFIG_ENABLE_CHIP_SHELL
-    static CHIP_ERROR StartAppShellTask();
+    static void StartAppShellTask();
     static void AppShellTask(void * args);
 #endif
 
diff --git a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter
index 3bc5de8ce77..f1feffda420 100644
--- a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter
@@ -1286,7 +1286,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1773,7 +1772,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1782,6 +1786,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1806,12 +1811,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1838,13 +1850,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2056,7 +2068,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2187,6 +2199,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2314,6 +2327,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
index 076fd3d1118..85588c06f40 100644
--- a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1659,6 +1659,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3376,6 +3392,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 2aa78bc5567..1803b7ef128 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -1210,7 +1210,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1814,7 +1813,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1823,6 +1827,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1847,12 +1852,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1879,13 +1891,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1927,7 +1939,7 @@ cluster BooleanState = 69 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2050,6 +2062,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2216,6 +2229,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
index 411831192b0..cadd9de26d4 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1593,6 +1593,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3789,6 +3805,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
index 6fe5bb84bd7..ade8d16f86a 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
@@ -1210,7 +1210,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1697,7 +1696,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1706,6 +1710,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1730,12 +1735,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1762,13 +1774,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1890,7 +1902,7 @@ cluster IcdManagement = 70 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2022,6 +2034,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2157,6 +2170,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
index d8b408f0ef2..749cccc168d 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1744,6 +1744,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3597,6 +3613,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
index f1d1270a9fa..955558b7251 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
@@ -1210,7 +1210,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1697,7 +1696,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1706,6 +1710,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1730,12 +1735,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1762,13 +1774,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1890,7 +1902,7 @@ cluster IcdManagement = 70 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2022,6 +2034,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2157,6 +2170,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
index 3fc19102242..9f1ef7c4da8 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1744,6 +1744,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3597,6 +3613,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
index 0f2b9e7fe61..24ec8521e5c 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -1134,7 +1134,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1494,7 +1493,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1503,6 +1507,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1527,12 +1532,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1559,13 +1571,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1635,7 +1647,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Groups {
@@ -1770,6 +1782,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1847,6 +1860,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
index db2e22d7d4e..768e4b56c8c 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1749,6 +1749,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2730,6 +2746,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter
index a1287bad6ed..04266a21ba0 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter
@@ -1272,7 +1272,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1759,7 +1758,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1768,6 +1772,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1792,12 +1797,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1824,13 +1836,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2421,7 +2433,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2565,6 +2577,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2702,6 +2715,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
index 695f9aa03fc..9120b05bd53 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1903,6 +1903,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3773,6 +3789,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -5937,4 +5969,4 @@
       "parentEndpointIdentifier": null
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter
index 40fb7ec18f0..952a4f96bac 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter
@@ -1272,7 +1272,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1668,7 +1667,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1677,6 +1681,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1701,12 +1706,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1733,13 +1745,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2330,7 +2342,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2473,6 +2485,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2560,6 +2573,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
index 6b4091a0715..b7c432e8662 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1887,6 +1887,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2957,6 +2973,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -5275,4 +5307,4 @@
       "parentEndpointIdentifier": null
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter
index fbeeab5298f..faa8ffc04fa 100644
--- a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter
+++ b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter
@@ -1206,7 +1206,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1490,7 +1489,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1499,6 +1503,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1523,12 +1528,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1555,13 +1567,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1906,7 +1918,7 @@ provisional cluster CommodityMetering = 2823 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2033,6 +2045,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2087,6 +2100,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.zap b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.zap
index a97f84560ca..f8fe104b6bb 100644
--- a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.zap
+++ b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1727,6 +1727,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2395,6 +2411,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/energy-management/electrical-sensor/BUILD.gn b/examples/energy-management/electrical-sensor/BUILD.gn
index f568722c369..13e0fdb4a57 100644
--- a/examples/energy-management/electrical-sensor/BUILD.gn
+++ b/examples/energy-management/electrical-sensor/BUILD.gn
@@ -21,8 +21,8 @@ config("config") {
 
 static_library("electrical-sensor") {
   sources = [
-    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp",
-    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp",
   ]
 
   public_configs = [ ":config" ]
diff --git a/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h b/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
similarity index 98%
rename from examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h
rename to examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
index ec5554e7166..0abded9fe10 100644
--- a/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h
+++ b/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include <app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.h>
+#include <app/clusters/electrical-power-measurement-server/CodegenIntegration.h>
 #include <app/util/af-types.h>
 #include <lib/core/CHIPError.h>
 
diff --git a/examples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h b/examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h
similarity index 100%
rename from examples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h
rename to examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h
diff --git a/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp b/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
similarity index 99%
rename from examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp
rename to examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
index 045668e26a0..c25dcf69b91 100644
--- a/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp
+++ b/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
@@ -16,8 +16,9 @@
  *    limitations under the License.
  */
 
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <app/reporting/reporting.h>
+#include <clusters/ElectricalPowerMeasurement/Attributes.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp b/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
similarity index 98%
rename from examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp
rename to examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
index 758373df5f5..d4620d68684 100644
--- a/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp
+++ b/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/evse-app/evse-common/evse-app.matter b/examples/evse-app/evse-common/evse-app.matter
index 56c36e1d591..50a133820de 100644
--- a/examples/evse-app/evse-common/evse-app.matter
+++ b/examples/evse-app/evse-common/evse-app.matter
@@ -1464,7 +1464,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1748,7 +1747,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1757,6 +1761,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1781,12 +1786,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1813,13 +1825,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2565,7 +2577,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2693,6 +2705,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2747,6 +2760,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/evse-app/evse-common/evse-app.zap b/examples/evse-app/evse-common/evse-app.zap
index c4263544f75..68ec776367b 100644
--- a/examples/evse-app/evse-common/evse-app.zap
+++ b/examples/evse-app/evse-common/evse-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1743,6 +1743,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2411,6 +2427,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h b/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
index 1b551ab77eb..f775ac08a1c 100644
--- a/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
+++ b/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
@@ -20,9 +20,9 @@
 
 #include <DEMManufacturerDelegate.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 using chip::Protocols::InteractionModel::Status;
 namespace chip {
diff --git a/examples/evse-app/evse-common/src/EVSEManufacturerImpl.cpp b/examples/evse-app/evse-common/src/EVSEManufacturerImpl.cpp
index ebf331541e7..a4250662cd3 100644
--- a/examples/evse-app/evse-common/src/EVSEManufacturerImpl.cpp
+++ b/examples/evse-app/evse-common/src/EVSEManufacturerImpl.cpp
@@ -465,7 +465,7 @@ CHIP_ERROR EVSEManufacturer::InitializePowerSourceCluster(chip::EndpointId endpo
     Span<EndpointId> endpointList    = Span<EndpointId>(endpointArray);
 
     // Note per API - we do not need to maintain the span after the SetEndpointList has been called
-    // since it takes a copy (see power-source-server.cpp)
+    // since it takes a copy (see power-source-server/CodegenIntegration.cpp)
     return PowerSourceServer::Instance().SetEndpointList(endpointId, endpointList);
 }
 
diff --git a/examples/evse-app/evse-common/src/EnergyEvseMain.cpp b/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
index 1de5e741024..4511d3be7f3 100644
--- a/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
+++ b/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
@@ -21,23 +21,20 @@
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
 #include <EVSEManufacturerImpl.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.h>
 #include <device-energy-management-modes.h>
 #include <energy-evse-modes.h>
 
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/data-model/Nullable.h>
 #include <app/server/Server.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/Linux/NetworkCommissioningDriver.h>
 
 using namespace chip;
 using namespace chip::app;
@@ -51,6 +48,22 @@ using namespace chip::app::Clusters::PowerTopology;
 
 namespace {
 
+const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type kMeasurementAccuracyRanges[] = {
+    { .rangeMin   = 0,
+      .rangeMax   = 1'000'000'000'000'000, // 1 million Mwh
+      .percentMax = MakeOptional(static_cast<chip::Percent100ths>(500)),
+      .percentMin = MakeOptional(static_cast<chip::Percent100ths>(50)) }
+};
+
+const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyStruct::Type kMeasurementAccuracy = {
+    .measurementType  = MeasurementTypeEnum::kElectricalEnergy,
+    .measured         = true,
+    .minMeasuredValue = 0,
+    .maxMeasuredValue = 1'000'000'000'000'000, // 1 million Mwh
+    .accuracyRanges   = DataModel::List<const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type>(
+        kMeasurementAccuracyRanges)
+};
+
 // Common cluster instances
 std::unique_ptr<DeviceEnergyManagementDelegate> gDEMDelegate;
 std::unique_ptr<DeviceEnergyManagementManager> gDEMInstance;
@@ -256,22 +269,6 @@ void emberAfElectricalEnergyMeasurementClusterInitCallback(chip::EndpointId endp
         BitMask<ElectricalEnergyMeasurement::OptionalAttributes, uint32_t>(
             ElectricalEnergyMeasurement::OptionalAttributes::kOptionalAttributeCumulativeEnergyReset));
 
-    ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type energyAccuracyRanges[] = {
-        { .rangeMin   = 0,
-          .rangeMax   = 1'000'000'000'000'000, // 1 million Mwh
-          .percentMax = MakeOptional(static_cast<chip::Percent100ths>(500)),
-          .percentMin = MakeOptional(static_cast<chip::Percent100ths>(50)) }
-    };
-
-    ElectricalEnergyMeasurement::Structs::MeasurementAccuracyStruct::Type accuracy = {
-        .measurementType  = MeasurementTypeEnum::kElectricalEnergy,
-        .measured         = true,
-        .minMeasuredValue = 0,
-        .maxMeasuredValue = 1'000'000'000'000'000,
-        .accuracyRanges =
-            DataModel::List<const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type>(energyAccuracyRanges)
-    };
-
     ElectricalEnergyMeasurement::Structs::CumulativeEnergyResetStruct::Type resetStruct = {
         .importedResetTimestamp = MakeOptional(MakeNullable(static_cast<uint32_t>(0))),
         .exportedResetTimestamp = MakeOptional(MakeNullable(static_cast<uint32_t>(0))),
@@ -282,7 +279,7 @@ void emberAfElectricalEnergyMeasurementClusterInitCallback(chip::EndpointId endp
     if (gEEMAttrAccess)
     {
         TEMPORARY_RETURN_IGNORED gEEMAttrAccess->Init();
-        TEMPORARY_RETURN_IGNORED SetMeasurementAccuracy(endpointId, accuracy);
+        TEMPORARY_RETURN_IGNORED SetMeasurementAccuracy(endpointId, kMeasurementAccuracy);
         TEMPORARY_RETURN_IGNORED SetCumulativeReset(endpointId, MakeOptional(resetStruct));
     }
 }
diff --git a/examples/evse-app/silabs/src/AppTask.cpp b/examples/evse-app/silabs/src/AppTask.cpp
index 22c50bfe533..3145b367298 100644
--- a/examples/evse-app/silabs/src/AppTask.cpp
+++ b/examples/evse-app/silabs/src/AppTask.cpp
@@ -217,7 +217,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
 void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
 {
-    bool initiated = false;
     int32_t actor;
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -231,13 +230,7 @@ void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
         err = APP_ERROR_UNHANDLED_EVENT;
     }
 
-    if (err == CHIP_NO_ERROR)
-    {
-        if (!initiated)
-        {
-            SILABS_LOG("Action is already in progress or active.");
-        }
-    }
+    // TODO: Implement evse action here (ex: Simulate car just plugged in or call event trigger)
 }
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
index dd27ad79228..5369b5913e9 100644
--- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
+++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
@@ -1195,7 +1195,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1799,7 +1798,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1808,6 +1812,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1832,12 +1837,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1864,13 +1876,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1923,7 +1935,7 @@ cluster CommissionerControl = 1873 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster AccessControl;
 
@@ -2040,6 +2052,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2210,6 +2223,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
index 21b790ff962..e13d5c4ca38 100644
--- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
+++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1547,6 +1547,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3866,6 +3882,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/fan-control-app/silabs/data_model/fan-control-thread-app.matter b/examples/fan-control-app/silabs/data_model/fan-control-thread-app.matter
index 989f777ed93..90717d0cfc6 100644
--- a/examples/fan-control-app/silabs/data_model/fan-control-thread-app.matter
+++ b/examples/fan-control-app/silabs/data_model/fan-control-thread-app.matter
@@ -1299,7 +1299,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1786,7 +1785,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1795,6 +1799,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1819,12 +1824,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1851,13 +1863,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/fan-control-app/silabs/data_model/fan-control-wifi-app.matter b/examples/fan-control-app/silabs/data_model/fan-control-wifi-app.matter
index 2380041a676..fa41d310e60 100644
--- a/examples/fan-control-app/silabs/data_model/fan-control-wifi-app.matter
+++ b/examples/fan-control-app/silabs/data_model/fan-control-wifi-app.matter
@@ -1299,7 +1299,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1695,7 +1694,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1704,6 +1708,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1728,12 +1733,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1760,13 +1772,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/jf-admin-app/jfa-common/jfa-app.matter b/examples/jf-admin-app/jfa-common/jfa-app.matter
index 27f6ce8c66b..978952775bb 100644
--- a/examples/jf-admin-app/jfa-common/jfa-app.matter
+++ b/examples/jf-admin-app/jfa-common/jfa-app.matter
@@ -1496,7 +1496,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2100,7 +2099,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2109,6 +2113,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2133,12 +2138,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2165,13 +2177,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2893,7 +2905,7 @@ provisional cluster JointFabricAdministrator = 1875 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -3042,6 +3054,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3216,6 +3229,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/jf-admin-app/jfa-common/jfa-app.zap b/examples/jf-admin-app/jfa-common/jfa-app.zap
index 7cb083efd2f..a028f2b350e 100644
--- a/examples/jf-admin-app/jfa-common/jfa-app.zap
+++ b/examples/jf-admin-app/jfa-common/jfa-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1914,6 +1914,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4267,6 +4283,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/jf-admin-app/linux/AppOptions.cpp b/examples/jf-admin-app/linux/AppOptions.cpp
new file mode 100644
index 00000000000..56cb1c405e4
--- /dev/null
+++ b/examples/jf-admin-app/linux/AppOptions.cpp
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2026 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 "AppOptions.h"
+
+#include <app/server/CommissioningWindowManager.h>
+#include <app/server/Server.h>
+
+using chip::ArgParser::OptionDef;
+using chip::ArgParser::OptionSet;
+using chip::ArgParser::PrintArgError;
+
+constexpr uint16_t kOptionMinCommissioningTimeout = 0xFF02;
+
+bool AppOptions::HandleOptions(const char * program, OptionSet * options, int identifier, const char * name, const char * value)
+{
+    bool retval = true;
+    switch (identifier)
+    {
+    case kOptionMinCommissioningTimeout: {
+        uint16_t timeout;
+        if (!chip::ArgParser::ParseInt(value, timeout))
+        {
+            chip::ArgParser::PrintArgError("%s: Invalid value for %s: %s\n", program, name, value);
+            retval = false;
+            break;
+        }
+        auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
+        commissionMgr.OverrideMinCommissioningTimeout(chip::System::Clock::Seconds16(timeout));
+        break;
+    }
+    default:
+        PrintArgError("%s: INTERNAL ERROR: Unhandled option: %s\n", program, name);
+        retval = false;
+        break;
+    }
+
+    return retval;
+}
+
+OptionSet * AppOptions::GetOptions()
+{
+    static OptionDef optionsDef[] = {
+        { "min_commissioning_timeout", chip::ArgParser::kArgumentRequired, kOptionMinCommissioningTimeout },
+        {},
+    };
+
+    static OptionSet options = {
+        AppOptions::HandleOptions, optionsDef, "PROGRAM OPTIONS",
+        "  --min_commissioning_timeout <value>\n"
+        "       The minimum time in seconds during which commissioning session establishment is allowed by the Node.\n"
+    };
+    return &options;
+}
diff --git a/examples/jf-admin-app/linux/AppOptions.h b/examples/jf-admin-app/linux/AppOptions.h
new file mode 100644
index 00000000000..c2d7db8b5d4
--- /dev/null
+++ b/examples/jf-admin-app/linux/AppOptions.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2026 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 "AppMain.h"
+
+class AppOptions
+{
+public:
+    static chip::ArgParser::OptionSet * GetOptions();
+
+private:
+    static bool HandleOptions(const char * program, chip::ArgParser::OptionSet * options, int identifier, const char * name,
+                              const char * value);
+};
diff --git a/examples/jf-admin-app/linux/BUILD.gn b/examples/jf-admin-app/linux/BUILD.gn
index c94663b032a..ba0acb06d86 100644
--- a/examples/jf-admin-app/linux/BUILD.gn
+++ b/examples/jf-admin-app/linux/BUILD.gn
@@ -36,6 +36,8 @@ config("includes") {
 
 executable("jfa-app") {
   sources = [
+    "AppOptions.cpp",
+    "AppOptions.h",
     "JFADatastoreSync.cpp",
     "JFAManager.cpp",
     "include/CHIPProjectAppConfig.h",
diff --git a/examples/jf-admin-app/linux/JFADatastoreSync.cpp b/examples/jf-admin-app/linux/JFADatastoreSync.cpp
index 4cd4c614dba..38eda804acf 100644
--- a/examples/jf-admin-app/linux/JFADatastoreSync.cpp
+++ b/examples/jf-admin-app/linux/JFADatastoreSync.cpp
@@ -37,12 +37,12 @@ using namespace chip::app::Clusters::JointFabricDatastore;
 
 extern DeviceCommissioner * GetDeviceCommissioner();
 
-constexpr uint8_t kJFAvailableShift = 0;
-constexpr uint8_t kJFAdminShift     = 1;
-constexpr uint8_t kJFAnchorShift    = 2;
-constexpr uint8_t kJFDatastoreShift = 3;
+[[maybe_unused]] constexpr uint8_t kJFAvailableShift = 0;
+[[maybe_unused]] constexpr uint8_t kJFAdminShift     = 1;
+[[maybe_unused]] constexpr uint8_t kJFAnchorShift    = 2;
+[[maybe_unused]] constexpr uint8_t kJFDatastoreShift = 3;
 
-static constexpr EndpointId kJFDatastoreClusterEndpointId = 1;
+[[maybe_unused]] static constexpr EndpointId kJFDatastoreClusterEndpointId = 1;
 
 JFADatastoreSync JFADatastoreSync::sJFDS;
 
diff --git a/examples/jf-admin-app/linux/main.cpp b/examples/jf-admin-app/linux/main.cpp
index bc0b003bdf4..14729bd0871 100644
--- a/examples/jf-admin-app/linux/main.cpp
+++ b/examples/jf-admin-app/linux/main.cpp
@@ -16,6 +16,7 @@
  *    limitations under the License.
  */
 
+#include "AppOptions.h"
 #include "JFADatastoreSync.h"
 #include "JFAManager.h"
 #include "rpc/RpcServer.h"
@@ -120,7 +121,7 @@ int main(int argc, char * argv[])
 {
     LinuxDeviceOptions::GetInstance().rpcServerPort = RPC_SERVER_PORT;
 
-    if (ChipLinuxAppInit(argc, argv) != 0)
+    if (ChipLinuxAppInit(argc, argv, AppOptions::GetOptions()) != 0)
     {
         return -1;
     }
diff --git a/examples/jf-control-app/args.gni b/examples/jf-control-app/args.gni
index 3801ef04cc3..3db324d4b6d 100644
--- a/examples/jf-control-app/args.gni
+++ b/examples/jf-control-app/args.gni
@@ -38,3 +38,4 @@ chip_tlv_validate_char_string_on_write = true
 # enable Joint Fabric features in the core SDK code
 # (e.g.: commissioner related code from src/controller)
 chip_device_config_enable_joint_fabric = true
+chip_support_thread_meshcop = false
diff --git a/examples/jf-control-app/commands/pairing/PairingCommand.h b/examples/jf-control-app/commands/pairing/PairingCommand.h
index d97df7b6770..f1f8109c97d 100644
--- a/examples/jf-control-app/commands/pairing/PairingCommand.h
+++ b/examples/jf-control-app/commands/pairing/PairingCommand.h
@@ -31,8 +31,10 @@
 
 #include <optional>
 
-using namespace ::chip;
-using namespace ::chip::Credentials;
+using ::chip::ByteSpan;
+using ::chip::NodeId;
+using ::chip::VendorId;
+using ::chip::Credentials::CertificateKeyId;
 
 using JCMDeviceCommissioner            = chip::Controller::JCM::DeviceCommissioner;
 using JCMTrustVerificationStateMachine = chip::Credentials::JCM::TrustVerificationStateMachine;
@@ -265,9 +267,10 @@ class PairingCommand : public CHIPCommand,
 
     /////////// JCMTrustVerificationDelegate /////////
     void OnProgressUpdate(JCMTrustVerificationStateMachine & stateMachine, JCMTrustVerificationStage stage,
-                          JCMTrustVerificationInfo & info, JCMTrustVerificationError error);
-    void OnAskUserForConsent(JCMTrustVerificationStateMachine & stateMachine, JCMTrustVerificationInfo & info);
-    CHIP_ERROR OnLookupOperationalTrustAnchor(VendorId vendorID, CertificateKeyId & subjectKeyId, ByteSpan & globallyTrustedRoot);
+                          JCMTrustVerificationInfo & info, JCMTrustVerificationError error) override;
+    void OnAskUserForConsent(JCMTrustVerificationStateMachine & stateMachine, JCMTrustVerificationInfo & info) override;
+    CHIP_ERROR OnLookupOperationalTrustAnchor(VendorId vendorID, CertificateKeyId & subjectKeyId,
+                                              ByteSpan & globallyTrustedRoot) override;
 
 private:
     CHIP_ERROR RunInternal(NodeId remoteId);
diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
index c857ae543a4..b379f4494a1 100644
--- a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
+++ b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
@@ -1419,7 +1419,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1815,7 +1814,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1824,6 +1828,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1848,12 +1853,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1880,13 +1892,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2084,7 +2096,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2235,6 +2247,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2329,6 +2342,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
index 4f08628afa7..d678b94f99a 100644
--- a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
+++ b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1982,6 +1982,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3154,6 +3170,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/asr/src/BindingHandler.cpp b/examples/light-switch-app/asr/src/BindingHandler.cpp
index 2aafe895a4e..584d90fe463 100644
--- a/examples/light-switch-app/asr/src/BindingHandler.cpp
+++ b/examples/light-switch-app/asr/src/BindingHandler.cpp
@@ -242,8 +242,8 @@ void BindingHandler::InitInternal(intptr_t arg)
 {
     ASR_LOG("Initialize binding Handler");
     auto & server = chip::Server::GetInstance();
-    TEMPORARY_RETURN_IGNORED Binding::Manager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    LogErrorOnFailure(Binding::Manager::GetInstance().Init(
+        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() }));
     Binding::Manager::GetInstance().RegisterBoundDeviceChangedHandler(LightSwitchChangedHandler);
     Binding::Manager::GetInstance().RegisterBoundDeviceContextReleaseHandler(LightSwitchContextReleaseHandler);
     BindingHandler::GetInstance().PrintBindingTable();
diff --git a/examples/light-switch-app/genio/src/AppTask.cpp b/examples/light-switch-app/genio/src/AppTask.cpp
index 503e4baf5f6..1f57114551d 100644
--- a/examples/light-switch-app/genio/src/AppTask.cpp
+++ b/examples/light-switch-app/genio/src/AppTask.cpp
@@ -122,15 +122,16 @@ CHIP_ERROR AppTask::Init()
     sWiFiNetworkCommissioningInstance.Init();
 #endif
 
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)
diff --git a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter
index 4c63ca29f83..7992dc435e9 100644
--- a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter
@@ -1426,7 +1426,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2232,7 +2231,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2241,6 +2245,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2265,12 +2270,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2297,13 +2309,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2903,7 +2915,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -3044,6 +3056,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3249,6 +3262,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
index e7c77a716de..28bce7f8cdc 100644
--- a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1851,6 +1851,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4552,6 +4568,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index edab9aef9e8..5a668188865 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1549,7 +1549,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2355,7 +2354,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2364,6 +2368,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2388,12 +2393,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2420,13 +2432,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3026,7 +3038,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -3167,6 +3179,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3372,6 +3385,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index 15283added3..dcda1de9359 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1851,6 +1851,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4552,6 +4568,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
index d3deaf8f232..5e8e69cb9b8 100644
--- a/examples/light-switch-app/qpg/zap/switch.matter
+++ b/examples/light-switch-app/qpg/zap/switch.matter
@@ -1807,7 +1807,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2349,7 +2348,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2358,6 +2362,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2382,12 +2387,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2414,13 +2426,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2866,7 +2878,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 1;
 
@@ -3029,6 +3041,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3170,6 +3183,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/qpg/zap/switch.zap b/examples/light-switch-app/qpg/zap/switch.zap
index 5e790fba598..e8813b6d21d 100644
--- a/examples/light-switch-app/qpg/zap/switch.zap
+++ b/examples/light-switch-app/qpg/zap/switch.zap
@@ -68,7 +68,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1,
         1
       ],
@@ -2156,6 +2156,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4118,6 +4134,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter
index 8b8f0afae5b..984533e2539 100644
--- a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter
+++ b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter
@@ -1485,7 +1485,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2174,7 +2173,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2183,6 +2187,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2207,12 +2212,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2239,13 +2251,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2382,7 +2394,7 @@ cluster IcdManagement = 70 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2525,6 +2537,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2681,6 +2694,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.zap b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.zap
index 705e10ebb19..cb6b14455b1 100644
--- a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.zap
+++ b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1813,6 +1813,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3859,6 +3875,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter
index 8bb4807dd8c..64eddfb9ab0 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter
@@ -1350,7 +1350,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2039,7 +2038,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2048,6 +2052,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2072,12 +2077,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2104,13 +2116,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2556,7 +2568,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2700,6 +2712,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2866,6 +2879,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.zap b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.zap
index e5f0e5fa179..00ff43336bf 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.zap
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1890,6 +1890,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4112,6 +4128,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter
index 166df43fa0d..a890dec0e99 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter
@@ -1350,7 +1350,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2156,7 +2155,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2165,6 +2169,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2189,12 +2194,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2221,13 +2233,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2673,7 +2685,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2817,6 +2829,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3022,6 +3035,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.zap b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.zap
index a2632ee01d3..92c09dc23c8 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.zap
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1890,6 +1890,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4591,6 +4607,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter
index d9a7dac158d..c69bc7ceb64 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter
@@ -1350,7 +1350,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2156,7 +2155,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2165,6 +2169,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2189,12 +2194,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2221,13 +2233,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2673,7 +2685,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2817,6 +2829,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3022,6 +3035,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.zap b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.zap
index e7c7419f0d4..7eaa07cce86 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.zap
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1890,6 +1890,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4591,6 +4607,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app.matter b/examples/light-switch-app/realtek/data_model/light-switch-app.matter
index 586d42e72fb..cac5e71dd62 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app.matter
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app.matter
@@ -1427,7 +1427,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1969,7 +1968,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1978,6 +1982,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2002,12 +2007,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2034,13 +2046,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2504,7 +2516,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2636,6 +2648,7 @@ endpoint 0 {
     callback attribute upTime;
     callback attribute totalOperationalHours;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2771,6 +2784,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app.zap b/examples/light-switch-app/realtek/data_model/light-switch-app.zap
index 0949d84ccff..329d36b2dfb 100644
--- a/examples/light-switch-app/realtek/data_model/light-switch-app.zap
+++ b/examples/light-switch-app/realtek/data_model/light-switch-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1750,6 +1750,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3603,6 +3619,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/light-switch-app/silabs/src/BindingHandler.cpp b/examples/light-switch-app/silabs/src/BindingHandler.cpp
index d1edcdabbbe..99e907d99a4 100644
--- a/examples/light-switch-app/silabs/src/BindingHandler.cpp
+++ b/examples/light-switch-app/silabs/src/BindingHandler.cpp
@@ -391,8 +391,8 @@ void LightSwitchContextReleaseHandler(void * context)
 void InitBindingHandlerInternal(intptr_t arg)
 {
     auto & server = chip::Server::GetInstance();
-    TEMPORARY_RETURN_IGNORED Binding::Manager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    LogErrorOnFailure(Binding::Manager::GetInstance().Init(
+        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() }));
     Binding::Manager::GetInstance().RegisterBoundDeviceChangedHandler(LightSwitchChangedHandler);
     Binding::Manager::GetInstance().RegisterBoundDeviceContextReleaseHandler(LightSwitchContextReleaseHandler);
 }
diff --git a/examples/light-switch-app/telink/src/binding-handler.cpp b/examples/light-switch-app/telink/src/binding-handler.cpp
index e87e518a621..1732d95324d 100644
--- a/examples/light-switch-app/telink/src/binding-handler.cpp
+++ b/examples/light-switch-app/telink/src/binding-handler.cpp
@@ -435,8 +435,8 @@ static void RegisterSwitchCommands()
 void InitBindingHandlerInternal(intptr_t arg)
 {
     auto & server = chip::Server::GetInstance();
-    TEMPORARY_RETURN_IGNORED Binding::Manager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    LogErrorOnFailure(Binding::Manager::GetInstance().Init(
+        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() }));
     Binding::Manager::GetInstance().RegisterBoundDeviceChangedHandler(LightSwitchChangedHandler);
     Binding::Manager::GetInstance().RegisterBoundDeviceContextReleaseHandler(LightSwitchContextReleaseHandler);
 }
diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
index 35a732f089b..54d553b7b15 100644
--- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
+++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2139,7 +2138,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2148,6 +2152,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2172,12 +2177,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2204,13 +2216,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2713,7 +2725,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2832,6 +2844,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3006,6 +3019,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
index b95345f14cf..926d1681f00 100644
--- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
+++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1488,6 +1488,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3788,6 +3804,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/beken/main/chipinterface.cpp b/examples/lighting-app/beken/main/chipinterface.cpp
index 61d067bbe54..3167d2613c8 100644
--- a/examples/lighting-app/beken/main/chipinterface.cpp
+++ b/examples/lighting-app/beken/main/chipinterface.cpp
@@ -187,8 +187,10 @@ extern "C" void _init(void)
 
 static void InitServer(intptr_t context)
 {
-    BekenAppServer::Init();
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    BekenAppServer::Init();
     OTAHelpers::Instance().InitOTARequestor();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 }
diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
index 02c7a899b67..77f44c92b2f 100644
--- a/examples/lighting-app/bouffalolab/bl602/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
@@ -109,10 +109,6 @@ bouffalolab_executable("lighting_app") {
   defines +=
       [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
 
-  if (enable_lwip_pbuf_ram) {
-    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-  }
-
   bl_plat_name = "bl602"
   sources = [
     "${examples_plat_dir}/common/route_hook/bl_route_hook.c",
@@ -232,10 +228,6 @@ bouffalolab_executable("lighting_app") {
   inputs = [ ldscript ]
 
   if (chip_print_memory_usage) {
-    if (enable_lwip_pbuf_ram) {
-      ldflags += [ "-Wl,--defsym=__RAM_PBUF_POOL=0" ]
-    }
-
     ldflags += [
       "-Wl,--print-memory-usage",
       "-fstack-usage",
diff --git a/examples/lighting-app/bouffalolab/bl616/BUILD.gn b/examples/lighting-app/bouffalolab/bl616/BUILD.gn
index de07ab76f33..ff4fd15b148 100644
--- a/examples/lighting-app/bouffalolab/bl616/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl616/BUILD.gn
@@ -54,6 +54,10 @@ declare_args() {
   board = "BL616DK"
   module_type = "BL616"
   baudrate = 2000000
+
+  app_ver_x = 2
+  app_ver_y = 1
+  app_ver_z = 0
 }
 
 bouffalo_sdk("sdk") {
@@ -72,8 +76,18 @@ bouffalo_sdk("sdk") {
     "OTA_PERIODIC_TIMEOUT=${ota_periodic_query_timeout_seconds}",
     "OTA_AUTO_REBOOT_DELAY=${ota_auto_reboot_delay_seconds}",
     "CHIP_UART_BAUDRATE=${baudrate}",
+    "APP_VER_X=${app_ver_x}",
+    "APP_VER_Y=${app_ver_y}",
+    "APP_VER_Z=${app_ver_z}",
   ]
 
+  if (chip_enable_ethernet) {
+    include_dirs += [ "${example_dir}/bl616/ethernet" ]
+  } else if (chip_enable_wifi) {
+    include_dirs += [ "${example_dir}/bl616/wifi" ]
+  }
+  defines += [ "CHIP_DEVICE_CONFIG_ENABLE_ETHERNET=${chip_enable_ethernet}" ]
+
   defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
   if (chip_enable_pw_rpc) {
     include_dirs += [ "${examples_plat_dir}/common/rpc" ]
@@ -121,12 +135,7 @@ bouffalolab_executable("lighting_app") {
     defines += [ "BOOT_PIN_RESET=2" ]
   }
 
-  if (enable_lwip_pbuf_ram) {
-    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-  }
-
   defines += [ "BL616DK" ]
-
   sources = [
     "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
     "${example_dir}/common/AppTask.cpp",
diff --git a/examples/lighting-app/bouffalolab/bl616/FreeRTOSConfig.h b/examples/lighting-app/bouffalolab/bl616/FreeRTOSConfig.h
index 609c13605a9..f44f67839e9 100644
--- a/examples/lighting-app/bouffalolab/bl616/FreeRTOSConfig.h
+++ b/examples/lighting-app/bouffalolab/bl616/FreeRTOSConfig.h
@@ -103,10 +103,6 @@ to exclude the API function. */
 #define INCLUDE_xTaskGetHandle 1
 #define INCLUDE_xSemaphoreGetMutexHolder 1
 
-/* Normal assert() semantics without relying on the provision of an assert.h
-header file. */
-void vApplicationMallocFailedHook(void);
-
 #if __cplusplus
 extern "C" void vAssertCalled(void);
 #else
diff --git a/examples/platform/bouffalolab/bl616/bl616_lwip_hooks.h b/examples/lighting-app/bouffalolab/bl616/bl616_lwip_hooks.h
similarity index 100%
rename from examples/platform/bouffalolab/bl616/bl616_lwip_hooks.h
rename to examples/lighting-app/bouffalolab/bl616/bl616_lwip_hooks.h
diff --git a/examples/lighting-app/bouffalolab/bl616/ethernet/lwipopts_user.h b/examples/lighting-app/bouffalolab/bl616/ethernet/lwipopts_user.h
new file mode 100644
index 00000000000..a0e80b5f41e
--- /dev/null
+++ b/examples/lighting-app/bouffalolab/bl616/ethernet/lwipopts_user.h
@@ -0,0 +1,270 @@
+/**
+ * Copyright (c) 2022 Bouffalolab team
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ ******************************************************************************
+ */
+
+#ifndef LWIP_HDR_LWIPOPTS_H__
+#define LWIP_HDR_LWIPOPTS_H__
+
+#define LWIP_NETIF_API 1
+
+/* ---------- Memory options ---------- */
+/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
+   lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
+   byte alignment -> define MEM_ALIGNMENT to 2. */
+#define MEM_ALIGNMENT 4
+
+/* MEM_SIZE: the size of the heap memory. If the application will send
+a lot of data that needs to be copied, this should be set high. */
+#define MEM_SIZE (32 * 1024)
+
+/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
+   sends a lot of data out of ROM (or other static memory), this
+   should be set high. */
+#define MEMP_NUM_PBUF 20
+/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+   per active UDP "connection". */
+#define MEMP_NUM_UDP_PCB 16
+/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
+   connections. */
+#define MEMP_NUM_TCP_PCB 6
+/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
+   connections. */
+#define MEMP_NUM_TCP_PCB_LISTEN 5
+/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
+   timeouts. */
+#define MEMP_NUM_SYS_TIMEOUT (LWIP_NUM_SYS_TIMEOUT_INTERNAL + 8 + 3)
+
+/* ---------- IPv4 options ---------- */
+#define LWIP_IPV4 1
+
+/* ---------- TCP options ---------- */
+#define LWIP_TCP 1
+#define TCP_TTL 255
+
+/* Controls if TCP should queue segments that arrive out of
+   order. Define to 0 if your device is low on memory. */
+#define TCP_QUEUE_OOSEQ 0
+
+/* TCP Maximum segment size. */
+#define TCP_MSS (1500 - 40) /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */
+
+/* TCP sender buffer space (bytes). */
+#define TCP_SND_BUF (16 * TCP_MSS)
+
+/*  TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least
+  as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. */
+
+#define TCP_SND_QUEUELEN (8 * TCP_SND_BUF / TCP_MSS)
+
+/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
+   segments. */
+#define MEMP_NUM_TCP_SEG TCP_SND_QUEUELEN
+
+/* TCP receive window. */
+#define TCP_WND (4 * TCP_MSS)
+
+/* ---------- Pbuf options ---------- */
+/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
+   @ note: used to allocate Tx pbufs only
+   mix pbuf size is (TCP_WND / TCP_MSS)  */
+#define PBUF_POOL_SIZE (2 * TCP_WND / TCP_MSS)
+
+/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
+#define PBUF_POOL_BUFSIZE 1524
+
+/* LWIP_SUPPORT_CUSTOM_PBUF == 1: to pass directly MAC Rx buffers to the stack
+   no copy is needed */
+#define LWIP_SUPPORT_CUSTOM_PBUF 1
+
+/* ---------- ICMP options ---------- */
+#define LWIP_ICMP 1
+
+/* ---------- DHCP options ---------- */
+#define LWIP_DHCP 1
+
+/* ---------- UDP options ---------- */
+#define LWIP_UDP 1
+#define UDP_TTL 255
+
+#define LWIP_NETIF_LOOPBACK 1
+#define LWIP_HAVE_LOOPIF 1
+#define LWIP_LOOPBACK_MAX_PBUFS 0
+
+#define LWIP_RAW 1
+#define LWIP_MULTICAST_TX_OPTIONS 1
+#define SO_REUSE 1
+
+#define LWIP_IGMP 1
+#define LWIP_IPV6 1
+#define LWIP_IPV6_DHCP6 1
+#define LWIP_IPV6_SCOPES 0
+#define LWIP_IPV6_MLD 1
+#define MEMP_NUM_MLD6_GROUP 10
+
+/* ---------- Statistics options ---------- */
+#define LWIP_STATS 0
+
+#define LWIP_TIMEVAL_PRIVATE 0 // use sys/time.h for struct timeval
+
+#define LWIP_ERRNO_STDINCLUDE 1
+#define LWIP_SOCKET_SET_ERRNO 1
+
+#ifdef __cplusplus
+extern "C" int * __errno(void);
+#else
+extern int * __errno(void);
+#endif
+#define errno (*__errno())
+#define LWIP_RAND() ((u32_t) random())
+
+/* ---------- link callback options ---------- */
+/* LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
+ * whenever the link changes (i.e., link down)
+ */
+#define LWIP_NETIF_LINK_CALLBACK 1
+#define LWIP_NETIF_STATUS_CALLBACK 1
+#define LWIP_NETIF_API 1
+#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
+
+/*
+   --------------------------------------
+   ---------- Checksum options ----------
+   --------------------------------------
+*/
+/* LWIP_CHECKSUM_ON_COPY==1: Calculate checksum when copying data from application buffers to pbufs. */
+#define LWIP_CHECKSUM_ON_COPY 0
+
+#ifdef CHECKSUM_BY_HARDWARE
+/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
+#define CHECKSUM_GEN_IP 0
+/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
+#define CHECKSUM_GEN_UDP 0
+/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
+#define CHECKSUM_GEN_TCP 0
+/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
+#define CHECKSUM_CHECK_IP 0
+/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
+#define CHECKSUM_CHECK_UDP 0
+/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
+#define CHECKSUM_CHECK_TCP 0
+/* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/
+#define CHECKSUM_GEN_ICMP 0
+#else
+/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
+#define CHECKSUM_GEN_IP 1
+/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
+#define CHECKSUM_GEN_UDP 1
+/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
+#define CHECKSUM_GEN_TCP 1
+/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
+#define CHECKSUM_CHECK_IP 1
+/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
+#define CHECKSUM_CHECK_UDP 1
+/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
+#define CHECKSUM_CHECK_TCP 1
+/* CHECKSUM_CHECK_ICMP==1: Check checksums by hardware for incoming ICMP packets.*/
+#define CHECKSUM_GEN_ICMP 1
+#define CHECKSUM_CHECK_ICMP 1
+#endif
+
+/*
+   ----------------------------------------------
+   ---------- Sequential layer options ----------
+   ----------------------------------------------
+*/
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN 1
+
+/*
+   ------------------------------------
+   ---------- Socket options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET 1
+
+/* ---------------- httpd options --------------- */
+#define HTTPD_USE_CUSTOM_FSDATA 0
+
+/*
+   ----------------------------------------
+   ---------- Lwip Debug options ----------
+   ----------------------------------------
+*/
+#define LWIP_DEBUG LWIP_DBG_OFF
+#define ETHARP_DEBUG LWIP_DBG_OFF
+#define ICMP_DEBUG LWIP_DBG_OFF
+#define TCPIP_DEBUG LWIP_DBG_OFF
+#define TCP_DEBUG LWIP_DBG_OFF
+#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
+#define UDP_DEBUG LWIP_DBG_OFF
+#define SOCKET_DEBUG LWIP_DBG_OFF
+#define API_LIB_DEBUG LWIP_DBG_OFF
+#define HTTPD_DEBUG LWIP_DBG_OFF
+#define PBUF_DEBUG LWIP_DBG_OFF
+#define IP_DEBUG LWIP_DBG_OFF
+
+/*
+   ---------------------------------
+   ---------- OS options ----------
+   ---------------------------------
+*/
+
+#define osPriorityIdle 2         //< priority: idle (lowest)
+#define osPriorityLow 5          //< priority: low
+#define osPriorityBelowNormal 10 //< priority: below normal
+#define osPriorityNormal 15      //< priority: normal (default)
+#define osPriorityAboveNormal 20 //< priority: above normal
+#define osPriorityHigh 25        //< priority: high
+#define osPriorityRealtime 29    //< priority: realtime (highest)
+
+#define TCPIP_THREAD_NAME "TCP/IP"
+#define TCPIP_THREAD_STACKSIZE 1024
+#define TCPIP_MBOX_SIZE 100
+#define DEFAULT_UDP_RECVMBOX_SIZE 100
+#define DEFAULT_TCP_RECVMBOX_SIZE 100
+#define DEFAULT_ACCEPTMBOX_SIZE 100
+#define DEFAULT_THREAD_STACKSIZE 512
+#define TCPIP_THREAD_PRIO osPriorityHigh
+
+/* no wifi ram */
+#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size) u8_t variable_name[LWIP_MEM_ALIGN_BUFFER(size)]
+
+#define LWIP_DNS_SERVER 0
+
+#endif /* LWIP_HDR_LWIPOPTS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/examples/lighting-app/bouffalolab/bl616/wifi/lwipopts_user.h b/examples/lighting-app/bouffalolab/bl616/wifi/lwipopts_user.h
new file mode 100644
index 00000000000..3bce440b83f
--- /dev/null
+++ b/examples/lighting-app/bouffalolab/bl616/wifi/lwipopts_user.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Simon Goldschmidt
+ *
+ */
+#ifndef LWIP_HDR_LWIPOPTS_H__
+#define LWIP_HDR_LWIPOPTS_H__
+
+#define LWIP_NETIF_API 1
+#define LWIP_DEBUG 1
+#define LWIP_STATS_DISPLAY 1
+#define SOCKETS_DEBUG LWIP_DBG_OFF
+#ifdef BL616_DHCP_DEBUG
+#define DHCP_DEBUG LWIP_DBG_ON
+#else
+#define DHCP_DEBUG LWIP_DBG_OFF
+#endif
+#define ICMP_DEBUG LWIP_DBG_OFF
+#define ETHARP_DEBUG LWIP_DBG_OFF
+#define LWIP_MULTICAST_PING 1
+#define LWIP_BROADCAST_PING 1
+
+#define TCPIP_MBOX_SIZE 64
+#define TCPIP_THREAD_STACKSIZE 1024
+#define TCPIP_THREAD_PRIO 28
+
+#define DEFAULT_THREAD_STACKSIZE 1024
+#define DEFAULT_THREAD_PRIO 1
+#define DEFAULT_RAW_RECVMBOX_SIZE 32
+#define DEFAULT_UDP_RECVMBOX_SIZE 64
+#define DEFAULT_TCP_RECVMBOX_SIZE 64
+#define DEFAULT_ACCEPTMBOX_SIZE 32
+
+#define LWIP_NETIF_LOOPBACK 1
+#define LWIP_HAVE_LOOPIF 1
+#define LWIP_LOOPBACK_MAX_PBUFS 0
+
+#define LWIP_CHKSUM_ALGORITHM 3
+#define LWIP_TCPIP_CORE_LOCKING_INPUT 1
+
+#define PBUF_LINK_ENCAPSULATION_HLEN 388
+
+#define MEMP_NUM_NETBUF 32
+#define MEMP_NUM_NETCONN 16
+#define MEMP_NUM_UDP_PCB 16
+
+#define MAC_TXQ_DEPTH 32
+#define MAC_RXQ_DEPTH 12
+
+#define IP_REASS_MAX_PBUFS (2 * MAC_RXQ_DEPTH - 2)
+#define MEMP_NUM_REASSDATA LWIP_MIN((IP_REASS_MAX_PBUFS), 5)
+
+#define TCP_MSS (1500 - 40)
+#define TCP_WND (2 * MAC_RXQ_DEPTH * TCP_MSS)
+#define TCP_SND_BUF (4 * TCP_MSS)
+
+#define TCP_QUEUE_OOSEQ 1
+#define MEMP_NUM_TCP_SEG ((4 * TCP_SND_BUF) / TCP_MSS)
+#define MEMP_NUM_PBUF (TCP_SND_BUF / TCP_MSS)
+#define PBUF_POOL_SIZE 0
+#define LWIP_WND_SCALE 1
+#define TCP_RCV_SCALE 2
+#define TCP_SNDLOWAT LWIP_MIN(LWIP_MAX(((TCP_SND_BUF) / 4), (2 * TCP_MSS) + 1), (TCP_SND_BUF) -1)
+
+#define MEM_MIN_TCP (2300 + MEMP_NUM_PBUF * (100 + PBUF_LINK_ENCAPSULATION_HLEN))
+#define MEM_MIN MEM_MIN_TCP
+#define MEM_ALIGNMENT 4
+
+#if (defined(BL602))
+#define LWIP_HEAP_SIZE (14 * 1024)
+#else
+#define LWIP_HEAP_SIZE (18 * 1024)
+#endif
+
+#ifdef LWIP_HEAP_SIZE
+#define MEM_SIZE LWIP_HEAP_SIZE
+#else
+#if MEM_MIN > 8192
+#define MEM_SIZE MEM_MIN
+#else
+#define MEM_SIZE 8192
+#endif
+#endif
+
+#define LWIP_HOOK_FILENAME "bl616_lwip_hooks.h"
+
+#define LWIP_RAW 1
+#define LWIP_MULTICAST_TX_OPTIONS 1
+
+#define LWIP_TIMEVAL_PRIVATE 0 // use sys/time.h for struct timeval
+
+// #define LWIP_PROVIDE_ERRNO        1
+#define LWIP_ERRNO_STDINCLUDE 1
+#define LWIP_SOCKET_SET_ERRNO 1
+
+#define LWIP_DHCP 1
+#define LWIP_DNS 1
+#define LWIP_IGMP 0
+#define LWIP_SO_RCVTIMEO 1
+#define LWIP_SO_SNDTIMEO 1
+#define SO_REUSE 1
+#define LWIP_TCP_KEEPALIVE 1
+
+#define LWIP_IPV6 1
+#define LWIP_IPV6_DHCP6 1
+#define LWIP_IPV6_SCOPES 0
+#define LWIP_IPV6_MLD 1
+#define MEMP_NUM_MLD6_GROUP 10
+#define MEMP_NUM_SYS_TIMEOUT (LWIP_NUM_SYS_TIMEOUT_INTERNAL + 8 + 3)
+
+#define LWIP_NETIF_STATUS_CALLBACK 1
+#define LWIP_NETIF_API 1
+#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
+
+#define ETHARP_SUPPORT_STATIC_ENTRIES 1
+
+#define LWIP_SUPPORT_CUSTOM_PBUF 1
+#ifdef HIGH_PERFORMANCE_PBUF
+#define LWIP_NETIF_TX_SINGLE_PBUF 0
+#else
+#define LWIP_NETIF_TX_SINGLE_PBUF 1
+#endif
+#define LWIP_RAND() ((u32_t) random())
+
+#ifdef __cplusplus
+extern "C" int * __errno(void);
+#else
+extern int * __errno(void);
+#endif
+#define errno (*__errno())
+
+#endif /* LWIP_HDR_LWIPOPTS_H__ */
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp
index 6c7c18ac35e..0c672a4d38e 100644
--- a/examples/lighting-app/bouffalolab/common/AppTask.cpp
+++ b/examples/lighting-app/bouffalolab/common/AppTask.cpp
@@ -23,7 +23,7 @@
 #include <app/server/Server.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 #include <system/SystemClock.h>
@@ -106,15 +106,13 @@ void StartAppTask(void)
 
 #if CONFIG_ENABLE_CHIP_SHELL
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-CHIP_ERROR AppTask::StartAppShellTask()
+void AppTask::StartAppShellTask()
 {
     Engine::Root().Init();
 
     cmd_misc_init();
 
     Engine::Root().RunMainLoop();
-
-    return CHIP_NO_ERROR;
 }
 #else
 void AppTask::AppShellTask(void * args)
@@ -122,7 +120,7 @@ void AppTask::AppShellTask(void * args)
     Engine::Root().RunMainLoop();
 }
 
-CHIP_ERROR AppTask::StartAppShellTask()
+void AppTask::StartAppShellTask()
 {
     static TaskHandle_t shellTask;
 
@@ -131,8 +129,6 @@ CHIP_ERROR AppTask::StartAppShellTask()
     cmd_misc_init();
 
     xTaskCreate(AppTask::AppShellTask, "chip_shell", 1024 / sizeof(configSTACK_DEPTH_TYPE), NULL, APP_TASK_PRIORITY, &shellTask);
-
-    return CHIP_NO_ERROR;
 }
 #endif
 #endif
@@ -164,8 +160,8 @@ void AppTask::AppTaskMain(void * pvParameter)
     ButtonInit();
 #else
     uint32_t resetCnt = 0;
-    Internal::BLConfig::ReadConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
-    Internal::BLConfig::WriteConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
+    Internal::BflbConfig::ReadConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
+    Internal::BflbConfig::WriteConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
     GetAppTask().mButtonPressedTime = System::SystemClock().GetMonotonicMilliseconds64().count();
     ChipLogProgress(NotSpecified, "AppTaskMain %lld, resetCnt %ld", GetAppTask().mButtonPressedTime, resetCnt);
 #endif
@@ -238,7 +234,7 @@ void AppTask::AppTaskMain(void * pvParameter)
                 }
                 ChipLogProgress(NotSpecified, "APP_REBOOT_RESET_COUNT_KEY resetCnt %ld", resetCnt);
                 resetCnt = 0;
-                Internal::BLConfig::WriteConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
+                Internal::BflbConfig::WriteConfigValue(APP_REBOOT_RESET_COUNT_KEY, resetCnt);
             }
 #endif
             if (APP_EVENT_IDENTIFY_MASK & appEvent)
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.h b/examples/lighting-app/bouffalolab/common/AppTask.h
index 37f8678e050..4a72af3db0f 100644
--- a/examples/lighting-app/bouffalolab/common/AppTask.h
+++ b/examples/lighting-app/bouffalolab/common/AppTask.h
@@ -122,7 +122,7 @@ class AppTask
     static void ScheduleInit(intptr_t arg);
     static void AppTaskMain(void * pvParameter);
 
-    static CHIP_ERROR StartAppShellTask();
+    static void StartAppShellTask();
     static void AppShellTask(void * args);
 
     EndpointId mEndpointId = (EndpointId) 1;
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
index ec014bd4444..db6b6f911c4 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1841,7 +1840,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1850,6 +1854,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1874,12 +1879,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1906,13 +1918,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2261,7 +2273,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2385,6 +2397,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2457,6 +2470,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
index 948584cf001..2b92d11c38a 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1559,6 +1559,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2417,6 +2433,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index 0c2a3fa8cef..0f188331e01 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1967,7 +1966,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1976,6 +1980,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2000,12 +2005,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2032,13 +2044,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2387,7 +2399,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2508,6 +2520,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2633,6 +2646,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
index 7e52aa955ec..4ffb12fe235 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1511,6 +1511,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3239,6 +3255,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index 8c975b36dab..bdbba589214 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1876,7 +1875,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1885,6 +1889,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1909,12 +1914,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1941,13 +1953,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2296,7 +2308,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2417,6 +2429,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2494,6 +2507,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
index f7b2ab8fbde..7dfade64606 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1511,6 +1511,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2446,6 +2462,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/esp32/data_model/lighting-app.matter b/examples/lighting-app/esp32/data_model/lighting-app.matter
index cf9232fa38f..0ee3c0e00fa 100644
--- a/examples/lighting-app/esp32/data_model/lighting-app.matter
+++ b/examples/lighting-app/esp32/data_model/lighting-app.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2084,7 +2083,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2093,6 +2097,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2117,12 +2122,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2149,13 +2161,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2504,7 +2516,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2643,6 +2655,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2815,6 +2828,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lighting-app/esp32/data_model/lighting-app.zap b/examples/lighting-app/esp32/data_model/lighting-app.zap
index a97a228f80c..44d36c9faf3 100644
--- a/examples/lighting-app/esp32/data_model/lighting-app.zap
+++ b/examples/lighting-app/esp32/data_model/lighting-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1792,6 +1792,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4121,6 +4137,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/genio/src/AppTask.cpp b/examples/lighting-app/genio/src/AppTask.cpp
index 742d0a13d11..dd4e526c81b 100644
--- a/examples/lighting-app/genio/src/AppTask.cpp
+++ b/examples/lighting-app/genio/src/AppTask.cpp
@@ -323,15 +323,16 @@ CHIP_ERROR AppTask::Init()
     sWiFiNetworkCommissioningInstance.Init();
 #endif
 
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)
diff --git a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp
index 5f0e8a3d710..97510a593b5 100644
--- a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp
@@ -141,6 +141,10 @@ static Identify gIdentify1 = {
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -150,8 +154,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 13656f4929a..f18f42e6bcc 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1480,7 +1480,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2084,7 +2083,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2093,6 +2097,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2117,12 +2122,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2149,13 +2161,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2176,6 +2188,116 @@ cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+/** The Groupcast cluster manages the content of the node-wide multicast Group membership that is part of the underlying interaction layer. */
+provisional cluster Groupcast = 101 {
+  revision 1;
+
+  enum GroupcastTestResultEnum : enum8 {
+    kSuccess = 0;
+    kGeneralError = 1;
+    kMessageReplay = 2;
+    kFailedAuth = 3;
+    kNoAvailableKey = 4;
+    kSendFailure = 5;
+  }
+
+  enum GroupcastTestingEnum : enum8 {
+    kDisableTesting = 0;
+    kEnableListenerTesting = 1;
+    kEnableSenderTesting = 2;
+  }
+
+  enum MulticastAddrPolicyEnum : enum8 {
+    kIanaAddr = 0;
+    kPerGroup = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kListener = 0x1;
+    kSender = 0x2;
+    kPerGroup = 0x4;
+  }
+
+  fabric_scoped struct MembershipStruct {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+    fabric_sensitive int16u keySetID = 2;
+    optional boolean hasAuxiliaryACL = 3;
+    MulticastAddrPolicyEnum mcastAddrPolicy = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) GroupcastTesting = 0 {
+    optional octet_string sourceIpAddress = 0;
+    optional octet_string destinationIpAddress = 1;
+    optional group_id groupID = 2;
+    optional endpoint_no endpointID = 3;
+    optional cluster_id clusterID = 4;
+    optional int32u elementID = 5;
+    optional boolean accessAllowed = 6;
+    GroupcastTestResultEnum groupcastTestResult = 7;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute MembershipStruct membership[] = 0;
+  readonly attribute int16u maxMembershipCount = 1;
+  readonly attribute int16u maxMcastAddrCount = 2;
+  readonly attribute int16u usedMcastAddrCount = 3;
+  readonly attribute fabric_idx fabricUnderTest = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct JoinGroupRequest {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+    int16u keySetID = 2;
+    optional octet_string<16> key = 3;
+    optional boolean useAuxiliaryACL = 4;
+    optional boolean replaceEndpoints = 5;
+    optional MulticastAddrPolicyEnum mcastAddrPolicy = 6;
+  }
+
+  request struct LeaveGroupRequest {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+  }
+
+  response struct LeaveGroupResponse = 2 {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+  }
+
+  request struct UpdateGroupKeyRequest {
+    group_id groupID = 0;
+    int16u keySetID = 1;
+    optional octet_string<16> key = 2;
+  }
+
+  request struct ConfigureAuxiliaryACLRequest {
+    group_id groupID = 0;
+    boolean useAuxiliaryACL = 1;
+  }
+
+  request struct GroupcastTestingRequest {
+    GroupcastTestingEnum testOperation = 0;
+    optional int16u durationSeconds = 1;
+  }
+
+  /** This command SHALL be used to instruct the server to join a multicast group. */
+  fabric command access(invoke: manage) JoinGroup(JoinGroupRequest): DefaultSuccess = 0;
+  /** This command SHALL allow a maintainer to request that the server withdraws itself or specific endpoints from a specific group or from all groups of this client's fabric. */
+  fabric command access(invoke: manage) LeaveGroup(LeaveGroupRequest): LeaveGroupResponse = 1;
+  /** This command SHALL allow a fabric administrator to update the OperationalGroupKey associated with the existing group identified by GroupID, which is already joined. */
+  fabric command access(invoke: manage) UpdateGroupKey(UpdateGroupKeyRequest): DefaultSuccess = 3;
+  /** This command SHALL allow an Administrator to enable or disable the generation of AuxiliaryACL entries in the Access Control Cluster based on the groups joined (see Groupcast Auxiliary ACL Handling). */
+  fabric command access(invoke: administer) ConfigureAuxiliaryACL(ConfigureAuxiliaryACLRequest): DefaultSuccess = 4;
+  /** This command SHALL allow an Administrator to configure test modes that allow validation of Groupcast communication. */
+  fabric command access(invoke: administer) GroupcastTesting(GroupcastTestingRequest): DefaultSuccess = 5;
+}
+
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 cluster ColorControl = 768 {
   revision 9;
@@ -2504,7 +2626,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2642,6 +2764,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2816,6 +2939,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2833,6 +2957,26 @@ endpoint 0 {
     callback attribute featureMap;
     callback attribute clusterRevision;
   }
+
+  server cluster Groupcast {
+    emits event GroupcastTesting;
+    callback attribute membership;
+    callback attribute maxMembershipCount;
+    callback attribute maxMcastAddrCount;
+    callback attribute usedMcastAddrCount;
+    callback attribute fabricUnderTest;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    callback attribute clusterRevision default = 1;
+
+    handle command JoinGroup;
+    handle command LeaveGroup;
+    handle command UpdateGroupKey;
+    handle command ConfigureAuxiliaryACL;
+    handle command GroupcastTesting;
+  }
 }
 endpoint 1 {
   device type ma_colortemperaturelight = 268, version 4;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 6abb2bcddd8..b945a322df7 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1785,6 +1785,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4138,6 +4154,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -4251,10 +4283,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4267,6 +4299,210 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groupcast",
+          "code": 101,
+          "mfgCode": null,
+          "define": "GROUPCAST_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "JoinGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroupResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateGroupKey",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConfigureAuxiliaryACL",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GroupcastTesting",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Membership",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMembershipCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMcastAddrCount",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UsedMcastAddrCount",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FabricUnderTest",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "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": "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,
@@ -4275,6 +4511,31 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "GroupcastTesting",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
             }
           ]
         }
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 36b1ed5c079..8b05241a861 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -1434,7 +1434,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1921,7 +1920,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1930,6 +1934,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1954,12 +1959,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1986,18 +1998,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2099,6 +2111,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2222,6 +2235,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2232,7 +2246,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index accc54c5187..ed432debbc5 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1323,6 +1323,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2984,6 +3000,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -3040,7 +3072,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        4
       ],
       "deviceIdentifiers": [
         256
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index a83ca71074a..f771b3dc4e9 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -1738,7 +1738,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2225,7 +2224,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2234,6 +2238,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2258,12 +2263,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2290,13 +2302,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2896,7 +2908,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 1;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 0;
   device type ma_otarequestor = 18, version 1;
 
@@ -3052,6 +3064,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3193,6 +3206,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index 23540ceb276..0730669a62b 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -69,7 +69,7 @@
       ],
       "deviceVersions": [
         1,
-        1,
+        5,
         0
       ],
       "deviceIdentifiers": [
@@ -2044,6 +2044,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4006,6 +4022,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lighting-app/realtek/data_model/lighting-app.matter b/examples/lighting-app/realtek/data_model/lighting-app.matter
index 8d236a26dbc..cc0efbec741 100644
--- a/examples/lighting-app/realtek/data_model/lighting-app.matter
+++ b/examples/lighting-app/realtek/data_model/lighting-app.matter
@@ -1434,7 +1434,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1921,7 +1920,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1930,6 +1934,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1954,12 +1959,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1986,13 +1998,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2513,7 +2525,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2642,6 +2654,7 @@ endpoint 0 {
     callback attribute upTime;
     callback attribute totalOperationalHours;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2777,6 +2790,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lighting-app/realtek/data_model/lighting-app.zap b/examples/lighting-app/realtek/data_model/lighting-app.zap
index 90874afa9a5..2f2b4e3b341 100644
--- a/examples/lighting-app/realtek/data_model/lighting-app.zap
+++ b/examples/lighting-app/realtek/data_model/lighting-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1709,6 +1709,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3583,6 +3599,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
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 2db48cd608d..8b8a93075b5 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -1434,7 +1434,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1885,7 +1884,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1894,6 +1898,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1918,12 +1923,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1950,13 +1962,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2114,6 +2126,116 @@ provisional cluster ScenesManagement = 98 {
   fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
 }
 
+/** The Groupcast cluster manages the content of the node-wide multicast Group membership that is part of the underlying interaction layer. */
+provisional cluster Groupcast = 101 {
+  revision 1;
+
+  enum GroupcastTestResultEnum : enum8 {
+    kSuccess = 0;
+    kGeneralError = 1;
+    kMessageReplay = 2;
+    kFailedAuth = 3;
+    kNoAvailableKey = 4;
+    kSendFailure = 5;
+  }
+
+  enum GroupcastTestingEnum : enum8 {
+    kDisableTesting = 0;
+    kEnableListenerTesting = 1;
+    kEnableSenderTesting = 2;
+  }
+
+  enum MulticastAddrPolicyEnum : enum8 {
+    kIanaAddr = 0;
+    kPerGroup = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kListener = 0x1;
+    kSender = 0x2;
+    kPerGroup = 0x4;
+  }
+
+  fabric_scoped struct MembershipStruct {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+    fabric_sensitive int16u keySetID = 2;
+    optional boolean hasAuxiliaryACL = 3;
+    MulticastAddrPolicyEnum mcastAddrPolicy = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) GroupcastTesting = 0 {
+    optional octet_string sourceIpAddress = 0;
+    optional octet_string destinationIpAddress = 1;
+    optional group_id groupID = 2;
+    optional endpoint_no endpointID = 3;
+    optional cluster_id clusterID = 4;
+    optional int32u elementID = 5;
+    optional boolean accessAllowed = 6;
+    GroupcastTestResultEnum groupcastTestResult = 7;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute MembershipStruct membership[] = 0;
+  readonly attribute int16u maxMembershipCount = 1;
+  readonly attribute int16u maxMcastAddrCount = 2;
+  readonly attribute int16u usedMcastAddrCount = 3;
+  readonly attribute fabric_idx fabricUnderTest = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct JoinGroupRequest {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+    int16u keySetID = 2;
+    optional octet_string<16> key = 3;
+    optional boolean useAuxiliaryACL = 4;
+    optional boolean replaceEndpoints = 5;
+    optional MulticastAddrPolicyEnum mcastAddrPolicy = 6;
+  }
+
+  request struct LeaveGroupRequest {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+  }
+
+  response struct LeaveGroupResponse = 2 {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+  }
+
+  request struct UpdateGroupKeyRequest {
+    group_id groupID = 0;
+    int16u keySetID = 1;
+    optional octet_string<16> key = 2;
+  }
+
+  request struct ConfigureAuxiliaryACLRequest {
+    group_id groupID = 0;
+    boolean useAuxiliaryACL = 1;
+  }
+
+  request struct GroupcastTestingRequest {
+    GroupcastTestingEnum testOperation = 0;
+    optional int16u durationSeconds = 1;
+  }
+
+  /** This command SHALL be used to instruct the server to join a multicast group. */
+  fabric command access(invoke: manage) JoinGroup(JoinGroupRequest): DefaultSuccess = 0;
+  /** This command SHALL allow a maintainer to request that the server withdraws itself or specific endpoints from a specific group or from all groups of this client's fabric. */
+  fabric command access(invoke: manage) LeaveGroup(LeaveGroupRequest): LeaveGroupResponse = 1;
+  /** This command SHALL allow a fabric administrator to update the OperationalGroupKey associated with the existing group identified by GroupID, which is already joined. */
+  fabric command access(invoke: manage) UpdateGroupKey(UpdateGroupKeyRequest): DefaultSuccess = 3;
+  /** This command SHALL allow an Administrator to enable or disable the generation of AuxiliaryACL entries in the Access Control Cluster based on the groups joined (see Groupcast Auxiliary ACL Handling). */
+  fabric command access(invoke: administer) ConfigureAuxiliaryACL(ConfigureAuxiliaryACLRequest): DefaultSuccess = 4;
+  /** This command SHALL allow an Administrator to configure test modes that allow validation of Groupcast communication. */
+  fabric command access(invoke: administer) GroupcastTesting(GroupcastTestingRequest): DefaultSuccess = 5;
+}
+
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 cluster ColorControl = 768 {
   revision 9;
@@ -2442,7 +2564,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2566,6 +2688,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2690,6 +2813,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2701,6 +2825,26 @@ endpoint 0 {
     handle command KeySetRemove;
     handle command KeySetReadAllIndices;
   }
+
+  server cluster Groupcast {
+    emits event GroupcastTesting;
+    callback attribute membership;
+    callback attribute maxMembershipCount;
+    callback attribute maxMcastAddrCount;
+    callback attribute usedMcastAddrCount;
+    callback attribute fabricUnderTest;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    callback attribute clusterRevision default = 1;
+
+    handle command JoinGroup;
+    handle command LeaveGroup;
+    handle command UpdateGroupKey;
+    handle command ConfigureAuxiliaryACL;
+    handle command GroupcastTesting;
+  }
 }
 endpoint 1 {
   device type ma_extendedcolorlight = 269, version 4;
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 866e1b51670..07cd4bc2d18 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1719,6 +1719,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3456,6 +3472,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -3537,6 +3569,235 @@
               "reportableChange": 0
             }
           ]
+        },
+        {
+          "name": "Groupcast",
+          "code": 101,
+          "mfgCode": null,
+          "define": "GROUPCAST_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "JoinGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroupResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateGroupKey",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConfigureAuxiliaryACL",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GroupcastTesting",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Membership",
+              "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": "MaxMembershipCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMcastAddrCount",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UsedMcastAddrCount",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FabricUnderTest",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "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": "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": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "GroupcastTesting",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
         }
       ]
     },
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
index cb8b6885f0e..14162f525cb 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -1738,7 +1738,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2134,7 +2133,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2143,6 +2147,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2167,12 +2172,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2199,13 +2211,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2380,6 +2392,116 @@ provisional cluster ScenesManagement = 98 {
   fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
 }
 
+/** The Groupcast cluster manages the content of the node-wide multicast Group membership that is part of the underlying interaction layer. */
+provisional cluster Groupcast = 101 {
+  revision 1;
+
+  enum GroupcastTestResultEnum : enum8 {
+    kSuccess = 0;
+    kGeneralError = 1;
+    kMessageReplay = 2;
+    kFailedAuth = 3;
+    kNoAvailableKey = 4;
+    kSendFailure = 5;
+  }
+
+  enum GroupcastTestingEnum : enum8 {
+    kDisableTesting = 0;
+    kEnableListenerTesting = 1;
+    kEnableSenderTesting = 2;
+  }
+
+  enum MulticastAddrPolicyEnum : enum8 {
+    kIanaAddr = 0;
+    kPerGroup = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kListener = 0x1;
+    kSender = 0x2;
+    kPerGroup = 0x4;
+  }
+
+  fabric_scoped struct MembershipStruct {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+    fabric_sensitive int16u keySetID = 2;
+    optional boolean hasAuxiliaryACL = 3;
+    MulticastAddrPolicyEnum mcastAddrPolicy = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) GroupcastTesting = 0 {
+    optional octet_string sourceIpAddress = 0;
+    optional octet_string destinationIpAddress = 1;
+    optional group_id groupID = 2;
+    optional endpoint_no endpointID = 3;
+    optional cluster_id clusterID = 4;
+    optional int32u elementID = 5;
+    optional boolean accessAllowed = 6;
+    GroupcastTestResultEnum groupcastTestResult = 7;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute MembershipStruct membership[] = 0;
+  readonly attribute int16u maxMembershipCount = 1;
+  readonly attribute int16u maxMcastAddrCount = 2;
+  readonly attribute int16u usedMcastAddrCount = 3;
+  readonly attribute fabric_idx fabricUnderTest = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct JoinGroupRequest {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+    int16u keySetID = 2;
+    optional octet_string<16> key = 3;
+    optional boolean useAuxiliaryACL = 4;
+    optional boolean replaceEndpoints = 5;
+    optional MulticastAddrPolicyEnum mcastAddrPolicy = 6;
+  }
+
+  request struct LeaveGroupRequest {
+    group_id groupID = 0;
+    optional endpoint_no endpoints[] = 1;
+  }
+
+  response struct LeaveGroupResponse = 2 {
+    group_id groupID = 0;
+    endpoint_no endpoints[] = 1;
+  }
+
+  request struct UpdateGroupKeyRequest {
+    group_id groupID = 0;
+    int16u keySetID = 1;
+    optional octet_string<16> key = 2;
+  }
+
+  request struct ConfigureAuxiliaryACLRequest {
+    group_id groupID = 0;
+    boolean useAuxiliaryACL = 1;
+  }
+
+  request struct GroupcastTestingRequest {
+    GroupcastTestingEnum testOperation = 0;
+    optional int16u durationSeconds = 1;
+  }
+
+  /** This command SHALL be used to instruct the server to join a multicast group. */
+  fabric command access(invoke: manage) JoinGroup(JoinGroupRequest): DefaultSuccess = 0;
+  /** This command SHALL allow a maintainer to request that the server withdraws itself or specific endpoints from a specific group or from all groups of this client's fabric. */
+  fabric command access(invoke: manage) LeaveGroup(LeaveGroupRequest): LeaveGroupResponse = 1;
+  /** This command SHALL allow a fabric administrator to update the OperationalGroupKey associated with the existing group identified by GroupID, which is already joined. */
+  fabric command access(invoke: manage) UpdateGroupKey(UpdateGroupKeyRequest): DefaultSuccess = 3;
+  /** This command SHALL allow an Administrator to enable or disable the generation of AuxiliaryACL entries in the Access Control Cluster based on the groups joined (see Groupcast Auxiliary ACL Handling). */
+  fabric command access(invoke: administer) ConfigureAuxiliaryACL(ConfigureAuxiliaryACLRequest): DefaultSuccess = 4;
+  /** This command SHALL allow an Administrator to configure test modes that allow validation of Groupcast communication. */
+  fabric command access(invoke: administer) GroupcastTesting(GroupcastTestingRequest): DefaultSuccess = 5;
+}
+
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 cluster ColorControl = 768 {
   revision 9;
@@ -2708,7 +2830,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2838,6 +2960,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2924,6 +3047,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2941,6 +3065,26 @@ endpoint 0 {
     callback attribute featureMap;
     callback attribute clusterRevision;
   }
+
+  server cluster Groupcast {
+    emits event GroupcastTesting;
+    callback attribute membership;
+    callback attribute maxMembershipCount;
+    callback attribute maxMcastAddrCount;
+    callback attribute usedMcastAddrCount;
+    callback attribute fabricUnderTest;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    callback attribute clusterRevision default = 1;
+
+    handle command JoinGroup;
+    handle command LeaveGroup;
+    handle command UpdateGroupKey;
+    handle command ConfigureAuxiliaryACL;
+    handle command GroupcastTesting;
+  }
 }
 endpoint 1 {
   device type ma_powersource = 17, version 1;
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
index 917e9bb37ea..15a5e9bc079 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1755,6 +1755,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2817,6 +2833,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -2956,6 +2988,235 @@
               "reportableChange": 0
             }
           ]
+        },
+        {
+          "name": "Groupcast",
+          "code": 101,
+          "mfgCode": null,
+          "define": "GROUPCAST_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "JoinGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "LeaveGroupResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateGroupKey",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConfigureAuxiliaryACL",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GroupcastTesting",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Membership",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMembershipCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMcastAddrCount",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UsedMcastAddrCount",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FabricUnderTest",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "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": "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "GroupcastTesting",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
         }
       ]
     },
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index 4f7bd7a30da..0e089efcdac 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -1345,7 +1345,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1913,7 +1912,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1922,6 +1926,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1946,12 +1951,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1978,13 +1990,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2123,7 +2135,7 @@ cluster IcdManagement = 70 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2238,6 +2250,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2340,6 +2353,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
index 37c51cf3a93..8d41bbba7d8 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -1606,6 +1606,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2906,6 +2922,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lock-app/cc32xx/main/AppTask.cpp b/examples/lock-app/cc32xx/main/AppTask.cpp
index 9abe7cc5bc7..80a6fbf4da0 100644
--- a/examples/lock-app/cc32xx/main/AppTask.cpp
+++ b/examples/lock-app/cc32xx/main/AppTask.cpp
@@ -148,14 +148,8 @@ int AppTask::Init()
             ;
     }
 
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
-    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
-
-    // Initialize device attestation config
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     PLAT_LOG("Initialize device attestation config");
 #ifdef CC32XX_ATTESTATION_CREDENTIALS
     SetDeviceAttestationCredentialsProvider(CC32XX::GetCC32XXDacProvider());
@@ -164,6 +158,13 @@ int AppTask::Init()
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #endif
 
+    // Init ZCL Data Model and start server
+    PLAT_LOG("Initialize Server");
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
+    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
+
     // Initialize BoltLock module
     PLAT_LOG("Initialize BoltLock");
     BoltLockMgr().Init();
diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp
index 91df6a443e7..b97291d3f91 100644
--- a/examples/lock-app/genio/src/AppTask.cpp
+++ b/examples/lock-app/genio/src/AppTask.cpp
@@ -135,15 +135,16 @@ CHIP_ERROR AppTask::Init()
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
     sWiFiNetworkCommissioningInstance.Init();
 #endif
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)
diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
index d1c3d5b4152..8ad5cdc0f56 100644
--- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
@@ -153,6 +153,14 @@ static Identify gIdentify1 = {
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+#if ENABLE_DEVICE_ATTESTATION
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleTrustMDACProvider());
+#else
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -162,13 +170,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-#if ENABLE_DEVICE_ATTESTATION
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleTrustMDACProvider());
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index ef40b17f2e8..528bbdb78cf 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1468,7 +1468,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2072,7 +2071,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2081,6 +2085,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2105,12 +2110,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2137,13 +2149,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2913,7 +2925,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -3063,6 +3075,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3237,6 +3250,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 113d2774c5e..76c02803b30 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1931,6 +1931,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4284,6 +4300,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 40254728fd2..5aadd232296 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -1226,7 +1226,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1713,7 +1712,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1722,6 +1726,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1746,12 +1751,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1778,13 +1790,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2537,7 +2549,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2679,6 +2691,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2814,6 +2827,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index d4bd873cead..c0c70ba311f 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1873,6 +1873,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3726,6 +3742,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index 149e82fad96..54e940674c3 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -1544,7 +1544,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2031,7 +2030,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2040,6 +2044,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2064,12 +2069,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2096,13 +2108,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2872,7 +2884,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 1;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 3;
 
@@ -3029,6 +3041,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3170,6 +3183,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index 7d15b64a360..e8790490b12 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -70,7 +70,7 @@
       "deviceVersions": [
         3,
         1,
-        1
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -2051,6 +2051,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4013,6 +4029,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lock-app/realtek/data_model/lock-app.matter b/examples/lock-app/realtek/data_model/lock-app.matter
index d5e64a0a0dd..a71e4642e12 100644
--- a/examples/lock-app/realtek/data_model/lock-app.matter
+++ b/examples/lock-app/realtek/data_model/lock-app.matter
@@ -1164,7 +1164,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1651,7 +1650,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1660,6 +1664,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1684,12 +1689,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1716,13 +1728,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2510,7 +2522,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2643,6 +2655,7 @@ endpoint 0 {
     callback attribute upTime;
     callback attribute totalOperationalHours;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2778,6 +2791,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lock-app/realtek/data_model/lock-app.zap b/examples/lock-app/realtek/data_model/lock-app.zap
index 33135b67d49..b7f98964376 100644
--- a/examples/lock-app/realtek/data_model/lock-app.zap
+++ b/examples/lock-app/realtek/data_model/lock-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1756,6 +1756,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3630,6 +3646,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/lock-app/silabs/data_model/lock-app.matter b/examples/lock-app/silabs/data_model/lock-app.matter
index 1b06461a5e5..86ec198d3ba 100644
--- a/examples/lock-app/silabs/data_model/lock-app.matter
+++ b/examples/lock-app/silabs/data_model/lock-app.matter
@@ -1468,7 +1468,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2072,7 +2071,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2081,6 +2085,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2105,12 +2110,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2137,13 +2149,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2913,7 +2925,7 @@ cluster DoorLock = 257 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 1;
 
@@ -3067,6 +3079,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3241,6 +3254,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/lock-app/silabs/data_model/lock-app.zap b/examples/lock-app/silabs/data_model/lock-app.zap
index ff859c751b8..719ce182633 100644
--- a/examples/lock-app/silabs/data_model/lock-app.zap
+++ b/examples/lock-app/silabs/data_model/lock-app.zap
@@ -69,7 +69,7 @@
       ],
       "deviceVersions": [
         1,
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1997,6 +1997,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4350,6 +4366,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/log-source-app/linux/main.cpp b/examples/log-source-app/linux/main.cpp
index 65cb8b336fb..4c2134393d3 100644
--- a/examples/log-source-app/linux/main.cpp
+++ b/examples/log-source-app/linux/main.cpp
@@ -104,14 +104,15 @@ int main(int argc, char * argv[])
     }
 
     chip::DeviceLayer::ConfigurationMgr().LogDeviceConfig();
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());
+
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());
-
     CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&GetLogProvider());
 
     chip::DeviceLayer::PlatformMgr().RunEventLoop();
diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
index de329a381b4..0225bba7489 100644
--- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
+++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
@@ -1012,7 +1012,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1372,7 +1371,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1381,6 +1385,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1405,12 +1410,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1437,13 +1449,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1595,7 +1607,7 @@ cluster OperationalState = 96 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1707,6 +1719,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1784,6 +1797,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap
index 94d1f113c1c..3915c928eb2 100644
--- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap
+++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1487,6 +1487,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2468,6 +2484,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.matter b/examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.matter
index 07194f64817..9300cb229ac 100644
--- a/examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.matter
+++ b/examples/multi-sensor-app/silabs/data_model/multi-sensor-thread-app.matter
@@ -1223,7 +1223,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1710,7 +1709,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1719,6 +1723,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1743,12 +1748,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1775,13 +1787,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2411,15 +2423,15 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -1000;
     ram      attribute maxMeasuredValue default = 8500;
     ram      attribute tolerance default = 40;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
diff --git a/examples/multi-sensor-app/silabs/data_model/multi-sensor-wifi-app.matter b/examples/multi-sensor-app/silabs/data_model/multi-sensor-wifi-app.matter
index 2ac7f5fe858..885c65bede5 100644
--- a/examples/multi-sensor-app/silabs/data_model/multi-sensor-wifi-app.matter
+++ b/examples/multi-sensor-app/silabs/data_model/multi-sensor-wifi-app.matter
@@ -1223,7 +1223,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1619,7 +1618,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1628,6 +1632,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1652,12 +1657,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1684,13 +1696,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2251,15 +2263,15 @@ endpoint 2 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -1000;
     ram      attribute maxMeasuredValue default = 8500;
     ram      attribute tolerance default = 40;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 3 {
diff --git a/examples/multi-sensor-app/silabs/src/SensorManager.cpp b/examples/multi-sensor-app/silabs/src/SensorManager.cpp
index e406cbc638f..7d292af4151 100644
--- a/examples/multi-sensor-app/silabs/src/SensorManager.cpp
+++ b/examples/multi-sensor-app/silabs/src/SensorManager.cpp
@@ -31,6 +31,7 @@
 #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/clusters/temperature-measurement-server/CodegenIntegration.h>
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 #include <sl_cmsis_os2_common.h>
 
@@ -101,7 +102,10 @@ void SensorActionTriggered(chip::System::Layer * aLayer, void * aAppState)
     RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Get(kHumiditySensorEndpoint, maxMeasuredHumidityValue);
 
     DataModel::Nullable<int16_t> currentTempValue;
-    TemperatureMeasurement::Attributes::MeasuredValue::Get(kTemperatureSensorEndpoint, currentTempValue);
+    if (TemperatureMeasurementCluster * cluster = TemperatureMeasurement::FindClusterOnEndpoint(kTemperatureSensorEndpoint))
+    {
+        currentTempValue = cluster->GetMeasuredValue();
+    }
     if (currentTempValue.IsNull())
     {
         // This configures the initial value for the simulated sensor values
@@ -139,7 +143,11 @@ void SensorActionTriggered(chip::System::Layer * aLayer, void * aAppState)
         mLastReportedTemperatureValue = temperature;
         reportState                   = MarkAttributeDirty::kIfChanged;
     }
-    TemperatureMeasurement::Attributes::MeasuredValue::Set(kTemperatureSensorEndpoint, temperature, reportState);
+    {
+        DataModel::Nullable<int16_t> tempVal;
+        tempVal.SetNonNull(temperature);
+        VerifyOrReturn(TemperatureMeasurement::SetMeasuredValue(kTemperatureSensorEndpoint, tempVal) == CHIP_NO_ERROR);
+    }
 
     // Check if humidity change requires a report - Checks if delta with last reported value is greater
     // than kAttributeChangeReportThreshold. If it is, the attribute is marked as dirty.
@@ -192,8 +200,13 @@ void ButtonActionTriggered(AppEvent * aEvent)
 
 Status GetMeasuredTemperature(chip::app::DataModel::Nullable<int16_t> & value)
 {
-    Status status = TemperatureMeasurement::Attributes::MeasuredValue::Get(kTemperatureSensorEndpoint, value);
-    return status;
+    TemperatureMeasurementCluster * cluster = TemperatureMeasurement::FindClusterOnEndpoint(kTemperatureSensorEndpoint);
+    if (cluster == nullptr)
+    {
+        return Status::UnsupportedEndpoint;
+    }
+    value = cluster->GetMeasuredValue();
+    return Status::Success;
 }
 
 Status GetMaxMeasuredTemperature(chip::app::DataModel::Nullable<int16_t> & value)
diff --git a/examples/network-manager-app/linux/main.cpp b/examples/network-manager-app/linux/main.cpp
index 5aae41cd0b0..4568922a348 100644
--- a/examples/network-manager-app/linux/main.cpp
+++ b/examples/network-manager-app/linux/main.cpp
@@ -18,7 +18,7 @@
 #include <AppMain.h>
 #include <app/clusters/thread-border-router-management-server/thread-border-router-management-server.h>
 #include <app/clusters/thread-network-directory-server/thread-network-directory-server.h>
-#include <app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h>
+#include <app/clusters/wifi-network-management-server/wifi-network-management-server.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter
index 7391823ca4a..36d4f4af1b2 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.matter
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter
@@ -963,7 +963,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1414,7 +1413,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1423,6 +1427,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1447,12 +1452,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1479,13 +1491,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1597,7 +1609,7 @@ cluster ThreadNetworkDirectory = 1107 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1706,6 +1718,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1760,6 +1773,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.zap b/examples/network-manager-app/network-manager-common/network-manager-app.zap
index 74be88b048c..e23283b5ef3 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.zap
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1454,6 +1454,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2152,6 +2168,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/onoff-plug-app/silabs/data_model/onoff-plug-app.matter b/examples/onoff-plug-app/silabs/data_model/onoff-plug-app.matter
index 625967cfa2a..920f2d609a4 100644
--- a/examples/onoff-plug-app/silabs/data_model/onoff-plug-app.matter
+++ b/examples/onoff-plug-app/silabs/data_model/onoff-plug-app.matter
@@ -1493,7 +1493,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2056,7 +2055,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2065,6 +2069,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2089,12 +2094,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2121,13 +2133,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index 0537ed0535b..f7825e4e954 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -1175,7 +1175,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1459,7 +1458,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1468,6 +1472,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1492,12 +1497,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1524,13 +1536,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1552,7 +1564,7 @@ cluster UserLabel = 65 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster AccessControl;
 
@@ -1660,6 +1672,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1706,6 +1719,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
index ec00c460b96..725ee5cd3d6 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1403,6 +1403,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1944,6 +1960,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 124abd8cb56..64a92f383d9 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -1311,7 +1311,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1595,7 +1594,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1604,6 +1608,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1628,12 +1633,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1660,13 +1672,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1688,7 +1700,7 @@ cluster UserLabel = 65 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -1816,6 +1828,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1871,6 +1884,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
index 08326eb98e3..5af7211e35c 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1733,6 +1733,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2418,6 +2434,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/oven-app/oven-app-common/oven-app.matter b/examples/oven-app/oven-app-common/oven-app.matter
index ef545951f3a..6ed38cf2b0a 100644
--- a/examples/oven-app/oven-app-common/oven-app.matter
+++ b/examples/oven-app/oven-app-common/oven-app.matter
@@ -1277,7 +1277,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1881,7 +1880,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1890,6 +1894,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1914,12 +1919,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1946,13 +1958,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2729,14 +2741,14 @@ endpoint 4 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 5 {
@@ -2779,14 +2791,14 @@ endpoint 5 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/oven-app/silabs/data_model/oven-wifi-app.matter b/examples/oven-app/silabs/data_model/oven-wifi-app.matter
index ef545951f3a..6ed38cf2b0a 100644
--- a/examples/oven-app/silabs/data_model/oven-wifi-app.matter
+++ b/examples/oven-app/silabs/data_model/oven-wifi-app.matter
@@ -1277,7 +1277,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1881,7 +1880,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1890,6 +1894,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1914,12 +1919,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1946,13 +1958,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2729,14 +2741,14 @@ endpoint 4 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 endpoint 5 {
@@ -2779,14 +2791,14 @@ endpoint 5 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index ab788097a1f..0e5e1a8ff16 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -2060,7 +2060,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -3189,7 +3188,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -3198,6 +3202,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -3222,12 +3227,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3254,13 +3266,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -8721,7 +8733,7 @@ cluster AccountLogin = 1294 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster GeneralCommissioning;
@@ -8898,6 +8910,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -9107,6 +9120,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -9326,12 +9340,12 @@ endpoint 0 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index baa44130605..0e84f3444fb 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2190,6 +2190,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -5063,6 +5079,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index abc1ae432a0..d9f948649d1 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -2060,7 +2060,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -3189,7 +3188,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -3198,6 +3202,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -3222,12 +3227,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3254,13 +3266,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -8678,7 +8690,7 @@ cluster AccountLogin = 1294 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
 
   binding cluster GeneralCommissioning;
@@ -8855,6 +8867,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -9064,6 +9077,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -9289,12 +9303,12 @@ endpoint 0 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance default = 0x0;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 1b64c03a695..545ef8f0d3a 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2190,6 +2190,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -5063,6 +5079,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/platform/asr/init_Matter.cpp b/examples/platform/asr/init_Matter.cpp
index a9e807509e7..0c90d6bd2b8 100644
--- a/examples/platform/asr/init_Matter.cpp
+++ b/examples/platform/asr/init_Matter.cpp
@@ -104,12 +104,12 @@ CHIP_ERROR MatterInitializer::Init_Matter_Server(void)
     initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(&sFactoryDataProvider);
     TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(&sFactoryDataProvider);
-
     ASR_LOG("Starting Platform Manager Event Loop");
     // // Start a task to run the CHIP Device event loop.
     err = PlatformMgr().StartEventLoopTask();
diff --git a/examples/platform/asr/shell/matter_shell.cpp b/examples/platform/asr/shell/matter_shell.cpp
index 66b12bd40bb..1db87fbf459 100644
--- a/examples/platform/asr/shell/matter_shell.cpp
+++ b/examples/platform/asr/shell/matter_shell.cpp
@@ -37,6 +37,7 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 #include "init_OTARequestor.h"
 #endif
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 
 using namespace ::chip;
 using namespace ::chip::Credentials;
@@ -97,8 +98,8 @@ void asr_matter_sensors(bool enable, int temp, int humi, int pressure)
 #ifdef ASR_BOARD_ENABLE_SENSORS
     if (enable)
     {
-        chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(
-            /* endpoint ID */ 1, static_cast<int16_t>(temp));
+        LogErrorOnFailure(
+            chip::app::Clusters::TemperatureMeasurement::SetMeasuredValue(/* endpoint ID */ 1, static_cast<int16_t>(temp)));
 
         chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(
             /* endpoint ID */ 1, static_cast<int16_t>(humi));
diff --git a/examples/platform/bouffalolab/bl602/ldscripts/flash_rom.ld b/examples/platform/bouffalolab/bl602/ldscripts/flash_rom.ld
index 6393c9d2d75..d6bd4c72803 100644
--- a/examples/platform/bouffalolab/bl602/ldscripts/flash_rom.ld
+++ b/examples/platform/bouffalolab/bl602/ldscripts/flash_rom.ld
@@ -11,9 +11,7 @@ __RFTLV_HEAD1_L = (0x41524150); /* PAPA */
 __RAM_START = 0x4200C000;
 __RAM_END = 0x4200C000 + 256K - __EM_SIZE; /* leave 8K left for BLE */
 
-__RAM_PBUF_POOL = DEFINED(__RAM_PBUF_POOL) ? __RAM_PBUF_POOL : 30K;
-
-__RAM_TCM_LEN = (16K + 16K + 48K + 64K + 64K - 16K - 16K + 30K - 12K - __RAM_PBUF_POOL);
+__RAM_TCM_LEN = (16K + 16K + 48K + 64K + 64K - 16K - 16K + 30K - 12K);
 __RAM_WIFI_LEN = (__RAM_END - __RAM_START - __RAM_TCM_LEN);
 
 MEMORY
@@ -159,6 +157,10 @@ SECTIONS
   {
     PROVIDE( __wifi_bss_start = ADDR(.wifibss) );
     PROVIDE( __wifi_bss_end = ADDR(.wifibss) + SIZEOF(.wifibss) );
+    _sshram = . ;
+    *(SHAREDRAMIPC)
+    *(SHAREDRAM)
+    _eshram = . ;
     *ipc_shared.o(COMMON)
     *sdu_shared.o(COMMON)
     *hal_desc.o(COMMON)
diff --git a/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h b/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h
index ebcb05a4866..502e8ebaecd 100644
--- a/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h
+++ b/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h
@@ -54,30 +54,18 @@
 a lot of data that needs to be copied, this should be set high. */
 #define MEM_SIZE (12 * 1024)
 
-/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
-   sends a lot of data out of ROM (or other static memory), this
-   should be set high. */
-#define MEMP_NUM_PBUF 26
-
 /* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
    per active UDP "connection". */
-#define MEMP_NUM_UDP_PCB 12
-
-/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
-   connections. */
-#define MEMP_NUM_TCP_PCB 10
-/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
-   connections. */
-#define MEMP_NUM_TCP_PCB_LISTEN 5
-/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
-   segments. */
-#define MEMP_NUM_TCP_SEG 32
+#define MEMP_NUM_UDP_PCB 10
 
 /* NUM of sys_timeout pool*/
 #define MEMP_NUM_SYS_TIMEOUT (LWIP_NUM_SYS_TIMEOUT_INTERNAL + 8 + 3)
 
 #define MEMP_NUM_NETCONN (MEMP_NUM_TCP_PCB + MEMP_NUM_UDP_PCB + MEMP_NUM_TCP_PCB_LISTEN)
 
+/* ---------- Pbuf options ---------- */
+#define PBUF_POOL_SIZE 0
+
 /* ---------- TCP options ---------- */
 #define LWIP_TCP 1
 #define IP_DEFAULT_TTL 64
@@ -147,6 +135,12 @@ a lot of data that needs to be copied, this should be set high. */
 #define LWIP_STATS 1
 #define LWIP_PROVIDE_ERRNO 1
 
+/* ---------- link callback options ---------- */
+/* LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
+ * whenever the link changes (i.e., link down)
+ */
+#define LWIP_NETIF_LINK_CALLBACK 1
+
 /*
    --------------------------------------
    ---------- Checksum options ----------
@@ -235,7 +229,7 @@ a lot of data that needs to be copied, this should be set high. */
 
 #define LWIP_COMPAT_MUTEX 0
 #define LWIP_TCPIP_CORE_LOCKING 1
-#define LWIP_NETCONN_SEM_PER_THREAD 0
+#define LWIP_SOCKET_SET_ERRNO 1
 #define LWIP_SOCKET_SET_ERRNO 1
 #define SO_REUSE 1
 #define LWIP_TCP_KEEPALIVE 1
@@ -243,7 +237,6 @@ a lot of data that needs to be copied, this should be set high. */
 /*Enable Status callback and link callback*/
 #define LWIP_NETIF_STATUS_CALLBACK 1
 #define LWIP_NETIF_LINK_CALLBACK 1
-
 /*Enable dns*/
 #define LWIP_DNS_SERVER 0
 #define LWIP_DNS 1
@@ -253,10 +246,11 @@ a lot of data that needs to be copied, this should be set high. */
 #define LWIP_SUPPORT_CUSTOM_PBUF 1
 
 #define PBUF_LINK_ENCAPSULATION_HLEN 48u
+#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
 
 #define LWIP_RAW 1
 
-#define LWIP_IPV4 1
+#define LWIP_IPV6 1
 #define LWIP_IPV6_DHCP6 1
 #define LWIP_AUTOIP 1
 #define LWIP_IPV6_MLD 1
@@ -265,37 +259,11 @@ a lot of data that needs to be copied, this should be set high. */
 
 #define LWIP_NETIF_EXT_STATUS_CALLBACK 1
 
-#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
-
 /*
    ---------------------------------
    ---------- MISC. options ----------
    ---------------------------------
 */
-
-#if defined(CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM) && CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM
-#define PBUF_POOL_SIZE 0
-#define MEM_LIBC_MALLOC 0
-#define MEM_USE_POOLS 0
-#define MEMP_USE_CUSTOM_POOLS 0
-
-#include <lwip/arch.h>
-#include <lwip/mem.h>
-#define LWIP_PBUF_CUSTOM_DATA mem_size_t pool;
-
-#if defined(__cplusplus)
-extern "C" const mem_size_t * memp_sizes;
-extern "C" struct pbuf * pbuf_rightsize(struct pbuf * p, s16_t offset);
-#else
-extern const mem_size_t * memp_sizes;
-extern struct pbuf * pbuf_rightsize(struct pbuf * p, s16_t offset);
-#endif
-#else
-
-#define PBUF_POOL_SIZE 20
-#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
-#endif
-
 #if defined(__cplusplus)
 extern "C" int bl_rand(void);
 extern "C" int * __errno(void);
diff --git a/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml b/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml
index 5265802f1a4..d3f82ac7490 100644
--- a/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml
+++ b/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml
@@ -33,7 +33,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 1
 # If header is 1 and security is 1, It will be encrypted.
-security = 1
+security= 1
 
 [[pt_entry]]
 type = 10
@@ -48,7 +48,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 1
 # If header is 1 and security is 1, It will be encrypted.
-security = 1
+security= 1
 
 [[pt_entry]]
 type = 2
@@ -63,7 +63,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 0
 # If header is 1 and security is 1, It will be encrypted.
-security = 0
+security= 0
 
 [[pt_entry]]
 type = 3
@@ -78,7 +78,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 0
 # If header is 1 and security is 1, It will be encrypted.
-security = 0
+security= 0
 
 [[pt_entry]]
 type = 4
@@ -93,7 +93,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 0
 # If header is 1 and security is 1, It will be encrypted.
-security = 0
+security= 0
 
 [[pt_entry]]
 type = 5
@@ -123,7 +123,7 @@ len = 0
 # If header is 1, it will add the header.
 header = 0
 # If header is 1 and security is 1, It will be encrypted.
-security = 0
+security= 0
 
 [[pt_entry]]
 type = 7
@@ -138,4 +138,4 @@ len = 0
 # If header is 1, it will add the header.
 header = 0
 # If header is 1 and security is 1, It will be encrypted.
-security = 0
+security= 0
diff --git a/examples/platform/bouffalolab/bl616/lwipopts.h b/examples/platform/bouffalolab/bl616/lwipopts.h
deleted file mode 100644
index 04671c945c2..00000000000
--- a/examples/platform/bouffalolab/bl616/lwipopts.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_LWIPOPTS_H__
-#define LWIP_HDR_LWIPOPTS_H__
-
-#include "arch/sys_arch.h"
-#include "rtos_def.h"
-#include <stdbool.h>
-
-#if defined(__cplusplus)
-extern "C" long random(void);
-extern "C" int * __errno(void);
-extern "C" uint16_t fhost_ip_chksum(const void * dataptr, int len);
-extern "C" sys_mutex_t lock_tcpip_core;
-extern "C" int sys_is_inside_interrupt(void);
-extern "C" int sys_mutex_is_locked(sys_mutex_t * mutex);
-extern "C" int sys_current_is_tcpip(void);
-#else
-extern long random(void);
-extern int * __errno(void);
-extern uint16_t fhost_ip_chksum(const void * dataptr, int len);
-extern sys_mutex_t lock_tcpip_core;
-extern int sys_is_inside_interrupt(void);
-extern int sys_mutex_is_locked(sys_mutex_t * mutex);
-extern int sys_current_is_tcpip(void);
-extern const int fhost_tcpip_priority;
-#endif
-
-#define LWIP_TCPIP_CORE_LOCKING 1
-#define IP_DEFAULT_TTL 64
-
-#if defined(CONFIG_HIGH_PERFORMANCE) && (CONFIG_HIGH_PERFORMANCE == 1)
-#define LWIP_ASSERT_CORE_LOCKED()
-#define LWIP_NOASSERT
-#else
-#if LWIP_TCPIP_CORE_LOCKING
-#define LWIP_ASSERT_CORE_LOCKED()                                                                                                  \
-    do                                                                                                                             \
-    {                                                                                                                              \
-        if (lock_tcpip_core)                                                                                                       \
-        {                                                                                                                          \
-            LWIP_ASSERT("api must call with lwip core lock", !sys_is_inside_interrupt() && sys_mutex_is_locked(&lock_tcpip_core)); \
-        }                                                                                                                          \
-    } while (0)
-#else
-#define LWIP_ASSERT_CORE_LOCKED()                                                                                                  \
-    do                                                                                                                             \
-    {                                                                                                                              \
-        LWIP_ASSERT("api must call inside lwip task", !sys_is_inside_interrupt() && sys_current_is_tcpip());                       \
-    } while (0)
-#endif
-#endif
-
-#define LWIP_NETIF_API 1
-#define LWIP_DEBUG 1
-#define LWIP_STATS_DISPLAY 1
-#define SOCKETS_DEBUG LWIP_DBG_OFF
-#ifdef BL616_DHCP_DEBUG
-#define DHCP_DEBUG LWIP_DBG_ON
-#else
-#define DHCP_DEBUG LWIP_DBG_OFF
-#endif
-#define ICMP_DEBUG LWIP_DBG_OFF
-#define ETHARP_DEBUG LWIP_DBG_OFF
-#define LWIP_MULTICAST_PING 1
-#define LWIP_BROADCAST_PING 1
-
-#define TCPIP_MBOX_SIZE 64
-#define TCPIP_THREAD_STACKSIZE FHOST_TCPIP_STACK_SIZE
-#define TCPIP_THREAD_PRIO fhost_tcpip_priority
-
-#define DEFAULT_THREAD_STACKSIZE 1024
-#define DEFAULT_THREAD_PRIO 1
-#define DEFAULT_RAW_RECVMBOX_SIZE 32
-#define DEFAULT_UDP_RECVMBOX_SIZE 64
-#define DEFAULT_TCP_RECVMBOX_SIZE 64
-#define DEFAULT_ACCEPTMBOX_SIZE 32
-
-#define LWIP_NETIF_LOOPBACK 1
-#define LWIP_HAVE_LOOPIF 1
-#define LWIP_LOOPBACK_MAX_PBUFS 0
-
-#define LWIP_CHKSUM_ALGORITHM 3
-#define LWIP_CHKSUM fhost_ip_chksum
-#define LWIP_TCPIP_CORE_LOCKING_INPUT 1
-
-#define PBUF_LINK_ENCAPSULATION_HLEN 388
-
-#define MEMP_NUM_NETBUF 32
-#define MEMP_NUM_NETCONN 16
-#define MEMP_NUM_UDP_PCB 16
-#define MEMP_NUM_REASSDATA LWIP_MIN((IP_REASS_MAX_PBUFS), 5)
-
-#define MEM_ALIGNMENT 4
-#define MEM_SIZE 30720
-#define PBUF_POOL_BUFSIZE (1280 + 462 + 26)
-#define MEMP_MEM_MALLOC 1
-
-// #define LWIP_HOOK_FILENAME        "lwiphooks.h"
-#define LWIP_HOOK_FILENAME "bl616_lwip_hooks.h"
-
-#define LWIP_RAW 1
-#define LWIP_MULTICAST_TX_OPTIONS 1
-
-#define LWIP_TIMEVAL_PRIVATE                                                                                                       \
-    0 // use sys/time.h for struct timeval
-      //
-// #define LWIP_PROVIDE_ERRNO            1
-#ifndef PLATFORM_PRIVDE_ERRNO
-#define LWIP_PROVIDE_ERRNO 1
-#else
-#define LWIP_ERRNO_STDINCLUDE 1
-#define LWIP_SOCKET_SET_ERRNO 1
-#endif
-
-#define LWIP_DHCP 1
-#define LWIP_DNS 1
-#define LWIP_IGMP 1
-#define LWIP_SO_RCVTIMEO 1
-#define LWIP_SO_SNDTIMEO 1
-#define SO_REUSE 1
-#define LWIP_TCP_KEEPALIVE 1
-#define LWIP_SO_RCVBUF 1
-
-#define LWIP_IPV6 1
-#define LWIP_IPV6_DHCP6 1
-#define LWIP_IPV6_SCOPES 0
-#define LWIP_IPV6_MLD 1
-#define MEMP_NUM_MLD6_GROUP 10
-
-#define MEMP_NUM_SYS_TIMEOUT (LWIP_NUM_SYS_TIMEOUT_INTERNAL + 8 + 3)
-
-#define LWIP_NETIF_STATUS_CALLBACK 1
-#define LWIP_NETIF_API 1
-#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
-
-#define ETHARP_SUPPORT_STATIC_ENTRIES 1
-
-#define LWIP_SUPPORT_CUSTOM_PBUF 1
-#ifdef HIGH_PERFORMANCE_PBUF
-#define LWIP_NETIF_TX_SINGLE_PBUF 0
-#else
-#define LWIP_NETIF_TX_SINGLE_PBUF 1
-#endif
-#define LWIP_RAND() ((u32_t) rand())
-#undef LWIP_DECLARE_MEMORY_ALIGNED
-#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size)                                                                           \
-    u8_t variable_name[size] __attribute__((aligned(4))) __attribute__((section("SHAREDRAM")))
-
-#if defined(CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM) && CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM
-#define PBUF_POOL_SIZE 0
-
-#include <lwip/arch.h>
-#include <lwip/mem.h>
-#define LWIP_PBUF_CUSTOM_DATA mem_size_t pool;
-
-#if defined(__cplusplus)
-extern "C" const mem_size_t * memp_sizes;
-extern "C" struct pbuf * pbuf_rightsize(struct pbuf * p, s16_t offset);
-#else
-extern const mem_size_t * memp_sizes;
-extern struct pbuf * pbuf_rightsize(struct pbuf * p, s16_t offset);
-#endif
-#else
-#define PBUF_POOL_SIZE 20
-#endif
-
-#endif /* LWIP_HDR_LWIPOPTS_H__ */
diff --git a/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld b/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
index 43e4dba2961..db04d57be08 100644
--- a/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
+++ b/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
@@ -6,11 +6,13 @@ __EM_SIZE = DEFINED(ble_controller_init) ? (DEFINED(em_16k_init) ? 16K : 8K) : 0
 __CACHE_SIZE = 16K;
 __stack_size = DEFINED(__stack_size) ? __stack_size : 2K;
 __sha_ocram_size = DEFINED(__sha_ocram_size) ? __sha_ocram_size : 128;
+__platform_size = 9K;
 
 MEMORY
 {
   flash  (rxai!w) : ORIGIN = 0x23000000, LENGTH = (2M)
-  tcm_ocram (wxa) : ORIGIN = 0x42010000 + __CACHE_SIZE, LENGTH = (64K - __CACHE_SIZE + 64K - __EM_SIZE - __stack_size - __sha_ocram_size)
+  tcm_ocram (wxa) : ORIGIN = 0x42010000 + __CACHE_SIZE, LENGTH = (64K - __CACHE_SIZE + 64K - __EM_SIZE - __stack_size - __sha_ocram_size - __platform_size)
+  platform_ocram (wxa) : ORIGIN = 0x42030000 - __EM_SIZE - __stack_size - __sha_ocram_size - __platform_size, LENGTH = __platform_size
   sys_stack (wxa) : ORIGIN = 0x42030000 - __EM_SIZE - __stack_size - __sha_ocram_size, LENGTH = __stack_size
   sha_ocram (wxa) : ORIGIN = 0x42030000 - __EM_SIZE - __sha_ocram_size, LENGTH = __sha_ocram_size
   hbnram    (wxa) : ORIGIN = 0x40010000, LENGTH = (4K)
@@ -226,6 +228,14 @@ SECTIONS
   PROVIDE( _heap2_start = .);
   PROVIDE( _heap2_size = ADDR(.stack) - _heap2_start );
 
+  .bss_platform (NOLOAD) :
+  {
+    PROVIDE( __bss_plat_start = ADDR(.bss_platform) );
+    PROVIDE( __bss_plat_end = ADDR(.bss_platform) + SIZEOF(.bss_platform) );
+    . = ALIGN(4);
+    KEEP(*libCHIP.a:*PlatformManagerImpl.cpp.o(.bss.*))
+  } >platform_ocram
+
   .bss_psram (NOLOAD) :
   {
     PROVIDE( __bss_psram_start = ADDR(.bss_psram) );
@@ -234,8 +244,8 @@ SECTIONS
     PROVIDE ( __psram_bss_init_start = . );
     /** put the bss data in psram between __psram_bss_init_start and __psram_bss_init_end will bet reset to 0 after psram init*/
     . = ALIGN(16);
-    KEEP(*libCHIP.a:*(EXCLUDE_FILE(*ThreadStackManagerImpl.cpp.o *PlatformManagerImpl.cpp.o) .bss.*))
-    KEEP(*libCHIP.a:*(EXCLUDE_FILE(*ThreadStackManagerImpl.cpp.o *PlatformManagerImpl.cpp.o) .sbss.*))
+    KEEP(*libCHIP.a:*(EXCLUDE_FILE(*ThreadStackManagerImpl.cpp.o) .bss.*))
+    KEEP(*libCHIP.a:*(EXCLUDE_FILE(*ThreadStackManagerImpl.cpp.o) .sbss.*))
 
     . = ALIGN(16);
     KEEP(*libCHIPAppServer.a:*(.sbss.*))
diff --git a/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h b/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h
index 981b17d14d9..9e0f67697b1 100644
--- a/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h
+++ b/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h
@@ -267,9 +267,9 @@ a lot of data that needs to be copied, this should be set high. */
 
 #define MEMP_MEM_MALLOC 0
 #define LWIP_SUPPORT_CUSTOM_PBUF 1
-
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
 #define PBUF_LINK_ENCAPSULATION_HLEN 48u
-
+#endif
 #define LWIP_RAW 1
 
 #define LWIP_IPV4 1
diff --git a/examples/platform/bouffalolab/bl702l/ldscripts/psram_flash.ld b/examples/platform/bouffalolab/bl702l/ldscripts/psram_flash.ld
index 7f07cfa5dd7..1c368563e91 100644
--- a/examples/platform/bouffalolab/bl702l/ldscripts/psram_flash.ld
+++ b/examples/platform/bouffalolab/bl702l/ldscripts/psram_flash.ld
@@ -12,7 +12,7 @@ MEMORY
   tcm_ocram (wxa) : ORIGIN = 0x4201C000 + __CACHE_SIZE, LENGTH = (16K - __CACHE_SIZE + 80K - __EM_SIZE - __stack_size)
   sys_stack (wxa) : ORIGIN = 0x42034000 - __EM_SIZE - __stack_size, LENGTH = __stack_size
   hbnram    (wxa) : ORIGIN = 0x40010000, LENGTH = (4K)
-  psram     (wxa) : ORIGIN = 0x26000000, LENGTH = (2M)
+  psram     (wxa) : ORIGIN = 0x24000000, LENGTH = (2M)
 }
 
 SECTIONS
diff --git a/examples/platform/bouffalolab/common/bouffalo_sdk/platform_port.cpp b/examples/platform/bouffalolab/common/bouffalo_sdk/platform_port.cpp
index e1be14c2a28..98d303f8dd2 100644
--- a/examples/platform/bouffalolab/common/bouffalo_sdk/platform_port.cpp
+++ b/examples/platform/bouffalolab/common/bouffalo_sdk/platform_port.cpp
@@ -40,6 +40,10 @@ void platform_port_init(void)
     __libc_init_array();
 
     bflb_mtd_init();
+
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+    board_emac_gpio_init();
+#endif
 }
 
 extern "C" void vAssertCalled(void)
diff --git a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
index 64f8965ff85..5923124e334 100644
--- a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
+++ b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
@@ -214,6 +214,15 @@ static const HeapRegion_t xHeapRegions[] = {
 };
 #endif
 
+#if CHIP_DEVICE_LAYER_TARGET_BL702
+extern "C" uint8_t __bss_plat_start;
+extern "C" uint8_t __bss_plat_end;
+void do_platform_bss_reset(void)
+{
+    memset(&__bss_plat_start, 0, &__bss_plat_end - &__bss_plat_start);
+}
+#endif
+
 #ifdef CFG_USE_PSRAM
 extern "C" uint8_t __psram_bss_init_start;
 extern "C" uint8_t __psram_bss_init_end;
@@ -287,6 +296,10 @@ extern "C" void setup_heap()
 
     bl_sys_early_init();
 
+#if CHIP_DEVICE_LAYER_TARGET_BL702
+    do_platform_bss_reset();
+#endif
+
 #ifdef CFG_USE_PSRAM
     bl_psram_init();
     do_psram_test();
diff --git a/examples/platform/bouffalolab/common/plat/main.cpp b/examples/platform/bouffalolab/common/plat/main.cpp
index 031f6cf86eb..66ed5b0f9a5 100644
--- a/examples/platform/bouffalolab/common/plat/main.cpp
+++ b/examples/platform/bouffalolab/common/plat/main.cpp
@@ -18,7 +18,7 @@
 
 #include <AppTask.h>
 
-#include <BLConfig.h>
+#include <BflbConfig.h>
 
 #include <plat.h>
 
@@ -47,7 +47,7 @@ extern "C" int START_ENTRY(void)
 {
     platform_port_init();
 
-    Internal::BLConfig::Init();
+    Internal::BflbConfig::Init();
 
     ChipLogProgress(NotSpecified, "==================================================");
     ChipLogProgress(NotSpecified, "bouffalolab chip-lighting-example, built at " __DATE__ " " __TIME__);
diff --git a/examples/platform/bouffalolab/common/plat/platform.cpp b/examples/platform/bouffalolab/common/plat/platform.cpp
index cc4a1bec468..5fc86196201 100644
--- a/examples/platform/bouffalolab/common/plat/platform.cpp
+++ b/examples/platform/bouffalolab/common/plat/platform.cpp
@@ -47,10 +47,6 @@
 #include <platform/bouffalolab/common/FactoryDataProvider.h>
 #endif
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-#include <NetworkCommissioningDriver.h>
-#endif
-
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
 #include <platform/OpenThread/GenericNetworkCommissioningThreadDriver.h>
 #include <platform/OpenThread/OpenThreadUtils.h>
@@ -68,13 +64,15 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI && CHIP_DEVICE_LAYER_TARGET_BL702
 #include <platform/bouffalolab/BL702/wifi_mgmr_portable.h>
 #endif
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-#include <platform/bouffalolab/BL702/EthernetInterface.h>
-#endif
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #endif
 
 #include <app/clusters/network-commissioning/network-commissioning.h>
 
+#if CONFIG_ENABLE_CHIP_SHELL && CHIP_DEVICE_CONFIG_ENABLE_WIFI
+#include <lib/shell/commands/WiFi.h>
+#endif
+
 #include <AppTask.h>
 #include <plat.h>
 
@@ -86,7 +84,7 @@ using namespace ::chip::DeviceLayer;
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 namespace {
 chip::app::Clusters::NetworkCommissioning::Instance
-    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::BLWiFiDriver::GetInstance()));
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::BflbWiFiDriver::GetInstance()));
 }
 #endif
 
@@ -94,6 +92,11 @@ chip::app::Clusters::NetworkCommissioning::Instance
 Clusters::NetworkCommissioning::InstanceAndDriver<NetworkCommissioning::GenericThreadDriver> sThreadNetworkDriver(0 /*endpointId*/);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+chip::app::Clusters::NetworkCommissioning::Instance
+    sEthernetNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::BflbEthernetDriver::GetInstance()));
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
 #if CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE
 namespace {
 FactoryDataProvider sFactoryDataProvider;
@@ -260,6 +263,13 @@ CHIP_ERROR PlatformManagerImpl::PlatformInit(void)
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     ReturnLogErrorOnFailure(sWiFiNetworkCommissioningInstance.Init());
+#if CONFIG_ENABLE_CHIP_SHELL
+    Shell::SetWiFiDriver(&(chip::DeviceLayer::NetworkCommissioning::BflbWiFiDriver::GetInstance()));
+#endif
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+    ReturnLogErrorOnFailure(sEthernetNetworkCommissioningInstance.Init());
 #endif
 
     // Initialize device attestation config
diff --git a/examples/platform/esp32/external_platform/ESP32_custom/LwIPCoreLock.cpp b/examples/platform/esp32/external_platform/ESP32_custom/LwIPCoreLock.cpp
deleted file mode 120000
index bff18cb8f31..00000000000
--- a/examples/platform/esp32/external_platform/ESP32_custom/LwIPCoreLock.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../src/platform/ESP32/LwIPCoreLock.cpp
\ No newline at end of file
diff --git a/examples/platform/esp32/external_platform/ESP32_custom/SystemTimeSupport.h b/examples/platform/esp32/external_platform/ESP32_custom/SystemTimeSupport.h
deleted file mode 120000
index d26a2b4c21f..00000000000
--- a/examples/platform/esp32/external_platform/ESP32_custom/SystemTimeSupport.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../src/platform/ESP32/SystemTimeSupport.h
\ No newline at end of file
diff --git a/examples/platform/esp32/pw_sync/BUILD.gn b/examples/platform/esp32/pw_sync/BUILD.gn
index 1fc1ee02b8a..b013e6106ea 100644
--- a/examples/platform/esp32/pw_sync/BUILD.gn
+++ b/examples/platform/esp32/pw_sync/BUILD.gn
@@ -60,6 +60,5 @@ pw_source_set("esp32_interrupt_spin_lock") {
   public_deps = [
     "$dir_pw_assert",
     "$dir_pw_sync:interrupt_spin_lock.facade",
-    "$dir_pw_sync:yield_core",
   ]
 }
diff --git a/examples/platform/esp32/pw_sync/CMakeLists.txt b/examples/platform/esp32/pw_sync/CMakeLists.txt
index 96b38a9b2b2..82ee879c9ae 100644
--- a/examples/platform/esp32/pw_sync/CMakeLists.txt
+++ b/examples/platform/esp32/pw_sync/CMakeLists.txt
@@ -34,7 +34,6 @@ pw_add_library(pw_sync.esp32_interrupt_spin_lock STATIC
     PUBLIC_DEPS
       pw_assert
       pw_sync.interrupt_spin_lock.facade
-      pw_sync.yield_core
       pw_third_party.freertos
     PUBLIC_COMPILE_OPTIONS
       -Wno-undef
diff --git a/examples/platform/infineon/cyw30739/matter_config.cpp b/examples/platform/infineon/cyw30739/matter_config.cpp
index 40b144dae73..5fb3a64a89b 100644
--- a/examples/platform/infineon/cyw30739/matter_config.cpp
+++ b/examples/platform/infineon/cyw30739/matter_config.cpp
@@ -246,7 +246,8 @@ void CYW30739MatterConfig::InitApp(void)
      * this to work and replace the old global instance call to the cluster
      */
     static Clusters::GeneralDiagnosticsCluster cluster(
-        Clusters::GeneralDiagnosticsCluster::OptionalAttributeSet{}, chip::BitFlags<Clusters::GeneralDiagnostics::Feature>{},
+        Clusters::GeneralDiagnosticsCluster::OptionalAttributeSet{},
+        chip::BitFlags<Clusters::GeneralDiagnostics::Feature>(Clusters::GeneralDiagnostics::Feature::kDeviceLoad),
         Clusters::GeneralDiagnosticsCluster::Context{
             .deviceLoadStatusProvider = *chip::app::InteractionModelEngine::GetInstance(),
             .diagnosticDataProvider   = DeviceLayer::GetDiagnosticDataProvider(),
diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
index 8c8b7f2cab1..aa0135e80c9 100644
--- a/examples/platform/linux/AppMain.cpp
+++ b/examples/platform/linux/AppMain.cpp
@@ -983,6 +983,10 @@ void ChipLinuxAppMainLoop(chip::ServerInitParams & initParams, AppMainLoopImplem
         initParams.advertiseCommissionableIfNoFabrics = false;
     }
 
+    // Set DAC provider before server init because Operational Credentials may snapshot
+    // the provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(LinuxDeviceOptions::GetInstance().dacProvider);
+
     // Init ZCL Data Model and CHIP App Server
     CHIP_ERROR err = Server::GetInstance().Init(initParams);
     if (err != CHIP_NO_ERROR)
@@ -1035,9 +1039,6 @@ void ChipLinuxAppMainLoop(chip::ServerInitParams & initParams, AppMainLoopImplem
 
     PrintOnboardingCodes(LinuxDeviceOptions::GetInstance().payload);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(LinuxDeviceOptions::GetInstance().dacProvider);
-
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
     ChipLogProgress(AppServer, "Starting commissioner");
     VerifyOrReturn(InitCommissioner(LinuxDeviceOptions::GetInstance().securedCommissionerPort,
diff --git a/examples/platform/nxp/common/app/support/Memconfig.cpp b/examples/platform/nxp/common/app/support/Memconfig.cpp
index 65c9008f453..cef05aa4ef5 100644
--- a/examples/platform/nxp/common/app/support/Memconfig.cpp
+++ b/examples/platform/nxp/common/app/support/Memconfig.cpp
@@ -105,26 +105,10 @@ void * __wrap_malloc(size_t size)
     return pvPortMalloc(size);
 }
 
-void * operator new(size_t size)
-{
-    return pvPortMalloc(size);
-}
-
-void operator delete(void * p)
-{
-    vPortFree(p);
-}
-
-void operator delete(void * p, unsigned int size)
-{
-    vPortFree(p);
-}
-
 void __wrap_free(void * ptr)
 {
     vPortFree(ptr);
 }
-
 void * __wrap_calloc(size_t num, size_t size)
 {
     size_t total_size = num * size;
@@ -208,3 +192,19 @@ int __wrap_printf(const char * fmt_s, ...)
 }
 
 } // extern "C"
+
+// C++ operators must be outside extern "C" block
+void * operator new(size_t size)
+{
+    return pvPortMalloc(size);
+}
+
+void operator delete(void * p)
+{
+    vPortFree(p);
+}
+
+void operator delete(void * p, size_t size)
+{
+    vPortFree(p);
+}
diff --git a/examples/platform/nxp/se05x/linux/AppMain.cpp b/examples/platform/nxp/se05x/linux/AppMain.cpp
index 1b24563226d..a749c75c9a6 100644
--- a/examples/platform/nxp/se05x/linux/AppMain.cpp
+++ b/examples/platform/nxp/se05x/linux/AppMain.cpp
@@ -37,8 +37,13 @@
 #include <credentials/DeviceAttestationCredsProvider.h>
 
 #include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPMemString.h>
+#include <lib/support/CodeUtils.h>
 #include <lib/support/ScopedBuffer.h>
 #include <lib/support/TestGroupData.h>
+#include <platform/CHIPDeviceEvent.h>
+#include <platform/ConnectivityManager.h>
+#include <platform/OpenThread/GenericNetworkCommissioningThreadDriver.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
@@ -94,6 +99,9 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_ELECTRICAL_GRID_CONDITIONS_TRIGGER
 #include <app/clusters/electrical-grid-conditions-server/ElectricalGridConditionsTestEventTriggerHandler.h>
 #endif
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_TARIFF_TRIGGER
+#include <app/clusters/commodity-tariff-server/CommodityTariffTestEventTriggerHandler.h>
+#endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ENERGY_EVSE_TRIGGER
 #include <app/clusters/energy-evse-server/EnergyEvseTestEventTriggerHandler.h>
 #endif
@@ -109,6 +117,9 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_DEVICE_ENERGY_MANAGEMENT_TRIGGER
 #include <app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h>
 #endif
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_METERING_TRIGGER
+#include <app/clusters/commodity-metering-server/CommodityMeteringTestEventTriggerHandler.h>
+#endif
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 #include <app/icd/server/ICDManager.h> // nogncheck
 #endif
@@ -138,15 +149,20 @@
 #include <platform/Linux/NetworkCommissioningDriver.h>
 #endif // CHIP_DEVICE_LAYER_TARGET_LINUX
 
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+#include <inet/EndPointStateOpenThread.h>
+#include <openthread-system.h>
+#include <openthread/instance.h>
+#endif
+
 #include <platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h>
+#include <platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h>
 #include <platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.h>
 #if ENABLE_SE05X_DEVICE_ATTESTATION
 #include "DeviceAttestationSe05xCredsExample.h"
 #endif
 #include <third_party/simw-top-mini/repo/demos/se05x_host_gpio/se05x_host_gpio.h>
 
-extern CHIP_ERROR se05x_close_session(void);
-
 using namespace chip;
 using namespace chip::ArgParser;
 using namespace chip::Credentials;
@@ -155,6 +171,7 @@ using namespace chip::Inet;
 using namespace chip::Transport;
 using namespace chip::app::Clusters;
 using namespace chip::Access;
+using namespace chip::Platform;
 
 // Network comissioning implementation
 namespace {
@@ -166,7 +183,11 @@ Optional<EndpointId> sSecondaryNetworkCommissioningEndpoint;
 #if CHIP_DEVICE_LAYER_TARGET_LINUX
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
 #define CHIP_APP_MAIN_HAS_THREAD_DRIVER 1
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+DeviceLayer::NetworkCommissioning::GenericThreadDriver sThreadDriver;
+#else
 DeviceLayer::NetworkCommissioning::LinuxThreadDriver sThreadDriver;
+#endif
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
@@ -221,7 +242,7 @@ auto exampleAccessRestrictionProvider = std::make_unique<ExampleAccessRestrictio
 void EnableThreadNetworkCommissioning()
 {
 #if CHIP_APP_MAIN_HAS_THREAD_DRIVER
-    sThreadNetworkCommissioningInstance.Init();
+    SuccessOrDie(sThreadNetworkCommissioningInstance.Init());
 #endif // CHIP_APP_MAIN_HAS_THREAD_DRIVER
 }
 
@@ -229,7 +250,7 @@ void EnableWiFiNetworkCommissioning(EndpointId endpoint)
 {
 #if CHIP_APP_MAIN_HAS_WIFI_DRIVER
     sWiFiNetworkCommissioningInstance.Emplace(endpoint, &sWiFiDriver);
-    sWiFiNetworkCommissioningInstance.Value().Init();
+    SuccessOrDie(sWiFiNetworkCommissioningInstance.Value().Init());
 #endif // CHIP_APP_MAIN_HAS_WIFI_DRIVER
 }
 
@@ -243,7 +264,11 @@ void InitNetworkCommissioning()
 
     bool isThreadEnabled = false;
 #if CHIP_APP_MAIN_HAS_THREAD_DRIVER
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+    isThreadEnabled = LinuxDeviceOptions::GetInstance().mThreadNodeId > 0;
+#else
     isThreadEnabled = LinuxDeviceOptions::GetInstance().mThread;
+#endif
 #endif // CHIP_APP_MAIN_HAS_THREAD_DRIVER
 
     bool isWiFiEnabled = false;
@@ -284,7 +309,10 @@ void InitNetworkCommissioning()
     else
     {
 #if CHIP_APP_MAIN_HAS_ETHERNET_DRIVER
-        sEthernetNetworkCommissioningInstance.Init();
+        TEMPORARY_RETURN_IGNORED sEthernetNetworkCommissioningInstance.Init();
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+        DeviceLayer::ConnectivityMgrImpl().UpdateEthernetNetworkingStatus();
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
 #endif // CHIP_APP_MAIN_HAS_ETHERNET_DRIVER
     }
 }
@@ -338,7 +366,7 @@ void StopMainEventLoop()
     else
     {
         Server::GetInstance().GenerateShutDownEvent();
-        SystemLayer().ScheduleLambda([]() { PlatformMgr().StopEventLoopTask(); });
+        TEMPORARY_RETURN_IGNORED SystemLayer().ScheduleLambda([]() { TEMPORARY_RETURN_IGNORED PlatformMgr().StopEventLoopTask(); });
     }
 }
 
@@ -434,11 +462,135 @@ static uint16_t WiFiPAFGet_FreqList(const char * args, std::unique_ptr<uint16_t[
 }
 #endif
 
+// Wrapper for DeviceInstanceInfoProvider that allows the example app to set
+// attribute values from the command-line, provide hardcoded values, or fall
+// back to the default DeviceInstanceInfoProvider.
+class ExampleDeviceInstanceInfoProvider : public DeviceInstanceInfoProvider
+{
+public:
+    void Init(DeviceInstanceInfoProvider * defaultProvider) { mDefaultProvider = defaultProvider; }
+
+    CHIP_ERROR GetVendorName(char * buf, size_t bufSize) override
+    {
+        // Check if it was set from the command line or fall back to default provider.
+        if (mVendorName.has_value())
+        {
+            VerifyOrReturnError(CanFitInNullTerminatedString(mVendorName.value(), bufSize), CHIP_ERROR_BUFFER_TOO_SMALL);
+            CopyString(buf, bufSize, mVendorName.value().c_str());
+            return CHIP_NO_ERROR;
+        }
+
+        return mDefaultProvider->GetVendorName(buf, bufSize);
+    }
+
+    CHIP_ERROR GetVendorId(uint16_t & vendorId) override { return mDefaultProvider->GetVendorId(vendorId); }
+
+    CHIP_ERROR GetProductName(char * buf, size_t bufSize) override
+    {
+        // Check if it was set from the command line or fall back to default provider.
+        if (mProductName.has_value())
+        {
+            VerifyOrReturnError(CanFitInNullTerminatedString(mProductName.value(), bufSize), CHIP_ERROR_BUFFER_TOO_SMALL);
+            CopyString(buf, bufSize, mProductName.value().c_str());
+            return CHIP_NO_ERROR;
+        }
+
+        return mDefaultProvider->GetProductName(buf, bufSize);
+    }
+
+    CHIP_ERROR GetProductId(uint16_t & productId) override { return mDefaultProvider->GetProductId(productId); }
+    CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override { return mDefaultProvider->GetPartNumber(buf, bufSize); }
+    CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override { return mDefaultProvider->GetProductURL(buf, bufSize); }
+    CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override { return mDefaultProvider->GetProductLabel(buf, bufSize); }
+
+    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override
+    {
+        // Check if it was set from the command line or fall back to default provider.
+        if (mSerialNumber.has_value())
+        {
+            VerifyOrReturnError(CanFitInNullTerminatedString(mSerialNumber.value(), bufSize), CHIP_ERROR_BUFFER_TOO_SMALL);
+            CopyString(buf, bufSize, mSerialNumber.value().c_str());
+            return CHIP_NO_ERROR;
+        }
+
+        return mDefaultProvider->GetSerialNumber(buf, bufSize);
+    }
+
+    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override
+    {
+        return mDefaultProvider->GetManufacturingDate(year, month, day);
+    }
+    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override
+    {
+        return mDefaultProvider->GetHardwareVersion(hardwareVersion);
+    }
+    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override
+    {
+        // Check if it was set from the command line or fall back to default provider.
+        if (mHardwareVersionString.has_value())
+        {
+            VerifyOrReturnError(CanFitInNullTerminatedString(mHardwareVersionString.value(), bufSize), CHIP_ERROR_BUFFER_TOO_SMALL);
+            CopyString(buf, bufSize, mHardwareVersionString.value().c_str());
+            return CHIP_NO_ERROR;
+        }
+
+        return mDefaultProvider->GetHardwareVersionString(buf, bufSize);
+    }
+
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override
+    {
+        return mDefaultProvider->GetRotatingDeviceIdUniqueId(uniqueIdSpan);
+    }
+
+    CHIP_ERROR GetProductFinish(chip::app::Clusters::BasicInformation::ProductFinishEnum * finish) override
+    {
+        // Our example device claims to have a Satin finish for now.  We can make
+        // this configurable as needed.
+        *finish = chip::app::Clusters::BasicInformation::ProductFinishEnum::kSatin;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetProductPrimaryColor(chip::app::Clusters::BasicInformation::ColorEnum * primaryColor) override
+    {
+        // Our example device claims to have a nice purple color for now.  We can
+        // make this configurable as needed.
+        *primaryColor = chip::app::Clusters::BasicInformation::ColorEnum::kPurple;
+        return CHIP_NO_ERROR;
+    }
+
+    // Once an attribute has been set with one of these Set methods, the
+    // corresponding Get method will return the stored value instead of getting
+    // the value from the default provider.
+    void SetVendorName(const std::string & buf) { mVendorName = buf; }
+    void SetProductName(const std::string & buf) { mProductName = buf; }
+    void SetSerialNumber(const std::string & buf) { mSerialNumber = buf; }
+    void SetHardwareVersionString(const std::string & buf) { mHardwareVersionString = buf; }
+
+private:
+    DeviceInstanceInfoProvider * mDefaultProvider;
+
+    // Values of basic information cluster attributes that may be set from the command-line.
+    // When GetX is called, if this has a value it will be returned instead of getting the
+    // value from the default provider.
+    std::optional<std::string> mVendorName;
+    std::optional<std::string> mProductName;
+    std::optional<std::string> mSerialNumber;
+    std::optional<std::string> mHardwareVersionString;
+
+    static inline bool CanFitInNullTerminatedString(const std::string & candidate, size_t bufSizeIncludingNull)
+    {
+        return bufSizeIncludingNull >= (candidate.size() + 1);
+    }
+};
+
+ExampleDeviceInstanceInfoProvider gExampleDeviceInstanceInfoProvider;
+
 int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
                      const Optional<EndpointId> secondaryNetworkCommissioningEndpoint)
 {
     CHIP_ERROR err            = CHIP_NO_ERROR;
     bool isAllClustersVariant = (std::string(argv[0]).find("all-clusters") != std::string::npos);
+    DeviceInstanceInfoProvider * defaultDeviceInstanceInfoProvider = nullptr;
 
 #if CONFIG_NETWORK_LAYER_BLE
     RendezvousInformationFlags rendezvousFlags = RendezvousInformationFlag::kBLE;
@@ -449,19 +601,16 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
 #ifdef CONFIG_RENDEZVOUS_MODE
     rendezvousFlags = static_cast<RendezvousInformationFlags>(CONFIG_RENDEZVOUS_MODE);
 #endif
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
-    rendezvousFlags.Set(RendezvousInformationFlag::kWiFiPAF);
-#endif
 
-    if (se05x_host_gpio_init() != 0)
+    if (se05x_host_gpio_power_init() != 0)
     {
-        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_init function");
+        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_power_init function");
         ChipLogError(NotSpecified, "SE05x - Crypto operations offloaded to secure element will fail");
     }
     else
     {
         ChipLogDetail(Crypto, "SE05x - Turn OFF secure Element");
-        if (se05x_host_gpio_set_value(0) != 0)
+        if (se05x_host_gpio_power_set(0) != 0)
         {
             ChipLogError(NotSpecified, "SE05x - Failed to set the GPIO connected to SE05x to low");
         }
@@ -473,6 +622,13 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     err = ParseArguments(argc, argv, customOptions);
     SuccessOrExit(err);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
+    if (LinuxDeviceOptions::GetInstance().mWiFiPAF)
+    {
+        rendezvousFlags.Set(RendezvousInformationFlag::kWiFiPAF);
+    }
+#endif
+
     sSecondaryNetworkCommissioningEndpoint = secondaryNetworkCommissioningEndpoint;
 
 #ifdef CHIP_CONFIG_KVS_PATH
@@ -542,7 +698,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     ChipLogProgress(NotSpecified, "PW_RPC initialized.");
 #endif // defined(PW_RPC_ENABLED)
 
-    DeviceLayer::PlatformMgrImpl().AddEventHandler(EventHandler, 0);
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgrImpl().AddEventHandler(EventHandler, 0);
 
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
     if (LinuxDeviceOptions::GetInstance().traceStreamFilename.HasValue())
@@ -570,9 +726,9 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
 #if CONFIG_NETWORK_LAYER_BLE
-    DeviceLayer::ConnectivityMgr().SetBLEDeviceName(nullptr); // Use default device name (CHIP-XXXX)
-    DeviceLayer::Internal::BLEMgrImpl().ConfigureBle(LinuxDeviceOptions::GetInstance().mBleDevice, false);
-    DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
+    TEMPORARY_RETURN_IGNORED DeviceLayer::ConnectivityMgr().SetBLEDeviceName(nullptr); // Use default device name (CHIP-XXXX)
+    TEMPORARY_RETURN_IGNORED DeviceLayer::Internal::BLEMgrImpl().ConfigureBle(LinuxDeviceOptions::GetInstance().mBleDevice, false);
+    TEMPORARY_RETURN_IGNORED DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
@@ -597,26 +753,50 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
 
             args.enable        = LinuxDeviceOptions::GetInstance().mWiFiPAF;
             args.freq_list_len = WiFiPAFGet_FreqList(LinuxDeviceOptions::GetInstance().mWiFiPAFExtCmds, args.freq_list);
-            DeviceLayer::ConnectivityMgr().WiFiPAFPublish(args);
+            TEMPORARY_RETURN_IGNORED DeviceLayer::ConnectivityMgr().WiFiPAFPublish(args);
             LinuxDeviceOptions::GetInstance().mPublishId = args.publish_id;
         }
     }
 #endif
 
 #if CHIP_ENABLE_OPENTHREAD
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+    if (LinuxDeviceOptions::GetInstance().mThreadNodeId)
+    {
+        std::string nodeid  = std::to_string(LinuxDeviceOptions::GetInstance().mThreadNodeId);
+        std::string logfile = "--log-file=thread.log";
+        char * args[]       = { argv[0], logfile.data(), nodeid.data() };
+
+        otSysInit(MATTER_ARRAY_SIZE(args), args);
+        SuccessOrExit(err = DeviceLayer::ThreadStackMgrImpl().InitThreadStack());
+        SuccessOrExit(err = DeviceLayer::ThreadStackMgrImpl().StartThreadTask());
+        ChipLogProgress(NotSpecified, "Thread initialized.");
+    }
+#else
     if (LinuxDeviceOptions::GetInstance().mThread)
     {
         SuccessOrExit(err = DeviceLayer::ThreadStackMgrImpl().InitThreadStack());
+        SuccessOrExit(err = DeviceLayer::ThreadStackMgrImpl().StartThreadTask());
         ChipLogProgress(NotSpecified, "Thread initialized.");
     }
-#endif // CHIP_ENABLE_OPENTHREAD
+#endif
+#endif
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     if (LinuxDeviceOptions::GetInstance().icdActiveModeDurationMs.HasValue() ||
-        LinuxDeviceOptions::GetInstance().icdIdleModeDurationMs.HasValue())
+        LinuxDeviceOptions::GetInstance().icdIdleModeDurationMs.HasValue() ||
+        LinuxDeviceOptions::GetInstance().shortIdleModeDurationS.has_value())
     {
-        err = Server::GetInstance().GetICDManager().SetModeDurations(LinuxDeviceOptions::GetInstance().icdActiveModeDurationMs,
-                                                                     LinuxDeviceOptions::GetInstance().icdIdleModeDurationMs);
+        // Convert icdIdleModeDurationMs to seconds for SetModeDurations api
+        std::optional<System::Clock::Seconds32> tmpIdleModeDuration = std::nullopt;
+        if (LinuxDeviceOptions::GetInstance().icdIdleModeDurationMs.HasValue())
+            tmpIdleModeDuration = std::chrono::duration_cast<System::Clock::Seconds32>(
+                LinuxDeviceOptions::GetInstance().icdIdleModeDurationMs.Value());
+
+        err = Server::GetInstance().GetICDManager().SetModeDurations(
+            LinuxDeviceOptions::GetInstance().icdActiveModeDurationMs.std_optional(), tmpIdleModeDuration,
+            LinuxDeviceOptions::GetInstance().shortIdleModeDurationS);
+
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(NotSpecified, "Invalid arguments to set ICD mode durations");
@@ -625,6 +805,28 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
+    // Initialize the ExampleDeviceInstanceInfoProvider.
+    defaultDeviceInstanceInfoProvider = GetDeviceInstanceInfoProvider();
+    if (defaultDeviceInstanceInfoProvider != &gExampleDeviceInstanceInfoProvider)
+    {
+        gExampleDeviceInstanceInfoProvider.Init(defaultDeviceInstanceInfoProvider);
+        SetDeviceInstanceInfoProvider(&gExampleDeviceInstanceInfoProvider);
+    }
+
+    // Command line arguments to set attributes of the basic information cluster.
+    if (LinuxDeviceOptions::GetInstance().vendorName.HasValue())
+        gExampleDeviceInstanceInfoProvider.SetVendorName(LinuxDeviceOptions::GetInstance().vendorName.Value());
+
+    if (LinuxDeviceOptions::GetInstance().productName.HasValue())
+        gExampleDeviceInstanceInfoProvider.SetProductName(LinuxDeviceOptions::GetInstance().productName.Value());
+
+    if (LinuxDeviceOptions::GetInstance().serialNumber.HasValue())
+        gExampleDeviceInstanceInfoProvider.SetSerialNumber(LinuxDeviceOptions::GetInstance().serialNumber.Value());
+
+    if (LinuxDeviceOptions::GetInstance().hardwareVersionString.HasValue())
+        gExampleDeviceInstanceInfoProvider.SetHardwareVersionString(
+            LinuxDeviceOptions::GetInstance().hardwareVersionString.Value());
+
 exit:
     if (err != CHIP_NO_ERROR)
     {
@@ -637,15 +839,24 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
     return 0;
 }
 
-void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
+struct LinuxCommonCaseDeviceServerInitParams final : public chip::CommonCaseDeviceServerInitParams
 {
-    gMainLoopImplementation = impl;
+    LinuxCommonCaseDeviceServerInitParams()
+    {
+        SuccessOrDie(InitializeStaticResourcesBeforeServerInit());
+        dataModelProvider = app::CodegenDataModelProviderInstance(persistentStorageDelegate);
+    }
+};
 
-    static chip::PersistentStorageOpKeystorese05x se05xInstance;
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    VerifyOrDie(initParams.InitializeStaticResourcesBeforeServerInit() == CHIP_NO_ERROR);
-    initParams.dataModelProvider   = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
-    initParams.operationalKeystore = &se05xInstance;
+chip::CommonCaseDeviceServerInitParams & ChipLinuxDefaultServerInitParams()
+{
+    static LinuxCommonCaseDeviceServerInitParams sInitParams;
+    return sInitParams;
+}
+
+void ChipLinuxAppMainLoop(chip::ServerInitParams & initParams, AppMainLoopImplementation * impl)
+{
+    gMainLoopImplementation = impl;
 
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
     if (LinuxDeviceOptions::GetInstance().tcVersion.HasValue() && LinuxDeviceOptions::GetInstance().tcRequired.HasValue())
@@ -653,7 +864,8 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
         uint16_t version  = LinuxDeviceOptions::GetInstance().tcVersion.Value();
         uint16_t required = LinuxDeviceOptions::GetInstance().tcRequired.Value();
         Optional<app::TermsAndConditions> requiredAcknowledgements(app::TermsAndConditions(required, version));
-        app::TermsAndConditionsManager::GetInstance().Init(initParams.persistentStorageDelegate, requiredAcknowledgements);
+        SuccessOrDie(
+            app::TermsAndConditionsManager::GetInstance().Init(initParams.persistentStorageDelegate, requiredAcknowledgements));
     }
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
 
@@ -681,6 +893,11 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
     initParams.userDirectedCommissioningPort = LinuxDeviceOptions::GetInstance().unsecuredCommissionerPort;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 
+#if CHIP_DEVICE_CONFIG_ENABLE_PORT_RETRY
+    // Enable automatic port retry to handle port conflicts
+    initParams.portRetryCount = CHIP_DEVICE_CONFIG_PORT_RETRY_COUNT;
+#endif
+
 #if ENABLE_TRACING
     chip::CommandLineApp::TracingSetup tracing_setup;
 
@@ -694,8 +911,8 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
 
     if (LinuxDeviceOptions::GetInstance().mCSRResponseOptions.csrExistingKeyPair)
     {
-        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.badCsrOperationalKeyStoreForTest.Init(
-            initParams.persistentStorageDelegate);
+        SuccessOrDie(LinuxDeviceOptions::GetInstance().mCSRResponseOptions.badCsrOperationalKeyStoreForTest.Init(
+            initParams.persistentStorageDelegate));
         initParams.operationalKeystore = &LinuxDeviceOptions::GetInstance().mCSRResponseOptions.badCsrOperationalKeyStoreForTest;
     }
 
@@ -708,55 +925,63 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
 
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_DIAGNOSTIC_TRIGGER
     static SoftwareDiagnosticsTestEventTriggerHandler sSoftwareDiagnosticsTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sSoftwareDiagnosticsTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sSoftwareDiagnosticsTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_DIAGNOSTIC_TRIGGER
     static WiFiDiagnosticsTestEventTriggerHandler sWiFiDiagnosticsTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sWiFiDiagnosticsTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sWiFiDiagnosticsTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // We want to allow triggering OTA queries if OTA requestor is enabled
     static OTATestEventTriggerHandler sOtaTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sOtaTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sOtaTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_SMOKE_CO_TRIGGER
     static SmokeCOTestEventTriggerHandler sSmokeCOTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sSmokeCOTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sSmokeCOTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_BOOLEAN_STATE_CONFIGURATION_TRIGGER
     static BooleanStateConfigurationTestEventTriggerHandler sBooleanStateConfigurationTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sBooleanStateConfigurationTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sBooleanStateConfigurationTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_PRICE_TRIGGER
     static CommodityPriceTestEventTriggerHandler sCommodityPriceTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sCommodityPriceTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sCommodityPriceTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ELECTRICAL_GRID_CONDITIONS_TRIGGER
     static ElectricalGridConditionsTestEventTriggerHandler sElectricalGridConditionsTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sElectricalGridConditionsTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sElectricalGridConditionsTestEventTriggerHandler));
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_TARIFF_TRIGGER
+    static CommodityTariffTestEventTriggerHandler sCommodityTariffTestEventTriggerHandler;
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sCommodityTariffTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ENERGY_EVSE_TRIGGER
     static EnergyEvseTestEventTriggerHandler sEnergyEvseTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sEnergyEvseTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sEnergyEvseTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER
     static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sEnergyReportingTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sEnergyReportingTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_METER_IDENTIFICATION_TRIGGER
     static MeterIdentificationTestEventTriggerHandler sMeterIdentificationTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sMeterIdentificationTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sMeterIdentificationTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WATER_HEATER_MANAGEMENT_TRIGGER
     static WaterHeaterManagementTestEventTriggerHandler sWaterHeaterManagementTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sWaterHeaterManagementTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sWaterHeaterManagementTestEventTriggerHandler));
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_DEVICE_ENERGY_MANAGEMENT_TRIGGER
     static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
-    sTestEventTriggerDelegate.AddHandler(&sDeviceEnergyManagementTestEventTriggerHandler);
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&sDeviceEnergyManagementTestEventTriggerHandler));
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_METERING_TRIGGER
+    static CommodityMeteringTestEventTriggerHandler CommodityMeteringTestEventTriggerHandler;
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&CommodityMeteringTestEventTriggerHandler));
 #endif
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    sTestEventTriggerDelegate.AddHandler(&Server::GetInstance().GetICDManager());
+    SuccessOrDie(sTestEventTriggerDelegate.AddHandler(&Server::GetInstance().GetICDManager()));
 #endif
 
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
@@ -768,29 +993,61 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
     initParams.accessRestrictionProvider = exampleAccessRestrictionProvider.get();
 #endif
 
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = []() { chip::DeviceLayer::ThreadStackMgr().LockThreadStack(); };
+    nativeParams.unlockCb              = []() { chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack(); };
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
+#endif
+    if (LinuxDeviceOptions::GetInstance().payload.commissioningFlow == CommissioningFlow::kUserActionRequired)
+    {
+        initParams.advertiseCommissionableIfNoFabrics = false;
+    }
+
+    static chip::PersistentStorageOpKeystorese05x se05xInstance;
+    initParams.operationalKeystore = &se05xInstance;
+
+    // Set DAC provider before server init because Operational Credentials may snapshot
+    // the provider during cluster construction.
+#if ENABLE_SE05X_DEVICE_ATTESTATION
+    SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleSe05xDACProvider());
+#else
+    SetDeviceAttestationCredentialsProvider(LinuxDeviceOptions::GetInstance().dacProvider);
+#endif
+
     // Init ZCL Data Model and CHIP App Server
-    Server::GetInstance().Init(initParams);
-    se05xInstance.Init(initParams.persistentStorageDelegate);
+    CHIP_ERROR err = Server::GetInstance().Init(initParams);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(AppServer, "Server init failed: %" CHIP_ERROR_FORMAT, err.Format());
+        chipDie();
+    }
+
+    TEMPORARY_RETURN_IGNORED se05xInstance.Init(initParams.persistentStorageDelegate);
 
 #if CHIP_CONFIG_USE_ACCESS_RESTRICTIONS
     if (LinuxDeviceOptions::GetInstance().commissioningArlEntries.HasValue())
     {
-        exampleAccessRestrictionProvider->SetCommissioningEntries(
-            LinuxDeviceOptions::GetInstance().commissioningArlEntries.Value());
+        SuccessOrDie(exampleAccessRestrictionProvider->SetCommissioningEntries(
+            LinuxDeviceOptions::GetInstance().commissioningArlEntries.Value()));
     }
 
     if (LinuxDeviceOptions::GetInstance().arlEntries.HasValue())
     {
         // This example use of the ARL feature proactively installs the provided entries on fabric index 1
-        exampleAccessRestrictionProvider->SetEntries(1, LinuxDeviceOptions::GetInstance().arlEntries.Value());
+        SuccessOrDie(exampleAccessRestrictionProvider->SetEntries(1, LinuxDeviceOptions::GetInstance().arlEntries.Value()));
     }
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
     if (Server::GetInstance().GetFabricTable().FabricCount() != 0)
     {
         ChipLogProgress(AppServer, "Fabric already commissioned. Canceling publishing");
-        DeviceLayer::ConnectivityMgr().WiFiPAFShutdown(LinuxDeviceOptions::GetInstance().mPublishId,
-                                                       chip::WiFiPAF::WiFiPafRole::kWiFiPafRole_Publisher);
+        // TODO #40789: Should we just NOT call WiFiPAFShutdown at startup and instead make sure that WiFiPAF is not published at
+        // all? or Change the handling within WiFiPAFShutdown?
+        // TODO #40814: Check the Return Value of the call to WiFiPAFShutdown
+        TEMPORARY_RETURN_IGNORED DeviceLayer::ConnectivityMgr().WiFiPAFShutdown(LinuxDeviceOptions::GetInstance().mPublishId,
+                                                                                chip::WiFiPAF::WiFiPafRole::kWiFiPafRole_Publisher);
     }
 #endif
 
@@ -813,13 +1070,6 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
 
     PrintOnboardingCodes(LinuxDeviceOptions::GetInstance().payload);
 
-    // Initialize device attestation config
-#if ENABLE_SE05X_DEVICE_ATTESTATION
-    SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleSe05xDACProvider());
-#else
-    SetDeviceAttestationCredentialsProvider(LinuxDeviceOptions::GetInstance().dacProvider);
-#endif
-
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
     ChipLogProgress(AppServer, "Starting commissioner");
     VerifyOrReturn(InitCommissioner(LinuxDeviceOptions::GetInstance().securedCommissionerPort,
@@ -835,15 +1085,28 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
 
     ApplicationInit();
 
+#if CHIP_DEVICE_LAYER_TARGET_DARWIN
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
+    auto & platformMgr = chip::DeviceLayer::PlatformMgrImpl();
+    platformMgr.RegisterSignalHandler(SIGINT, ^{
+        platformMgr.UnregisterAllSignalHandlers();
+        StopSignalHandler(SIGINT);
+    });
+
+    platformMgr.RegisterSignalHandler(SIGTERM, ^{
+        platformMgr.UnregisterAllSignalHandlers();
+        StopSignalHandler(SIGTERM);
+    });
+#else
     // NOTE: For some reason, on Darwin, the signal handler is not called if the signal is
     //       registered with sigaction() call and TSAN is enabled. The problem seems to be
     //       related with the dispatch_semaphore_wait() function in the RunEventLoop() method.
     //       If this call is commented out, the signal handler is called as expected...
-#if defined(__APPLE__)
     // NOLINTBEGIN(bugprone-signal-handler)
     signal(SIGINT, StopSignalHandler);
     signal(SIGTERM, StopSignalHandler);
     // NOLINTEND(bugprone-signal-handler)
+#endif
 #else
     struct sigaction sa = {};
     sa.sa_handler       = StopSignalHandler;
@@ -852,6 +1115,12 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
     sigaction(SIGTERM, &sa, nullptr);
 #endif
 
+    // This message is used as a marker for when the application process has started.
+    // See: scripts/tests/chiptest/test_definition.py
+    // TODO: A cleaner and more generic mechanism needs to be developed as a follow-up.
+    // Currently other places (OTA, TV) also scrape logs for information and a better way should be
+    // possible.
+    ChipLogProgress(DeviceLayer, "===== APP STATUS: Starting event loop =====");
     if (impl != nullptr)
     {
         impl->RunMainLoop();
@@ -865,10 +1134,10 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
     ApplicationShutdown();
 
     // Close SE05x session
-    se05x_close_session();
+    TEMPORARY_RETURN_IGNORED se05x_close_session();
 
     ChipLogDetail(Crypto, "SE05x - De-initialize GPIO after Session Close");
-    if (se05x_host_gpio_deinit() != 0)
+    if (se05x_host_gpio_power_deinit() != 0)
     {
         ChipLogError(NotSpecified, "SE05x - Failed to de-initialize GPIO connected to SE05x");
     }
diff --git a/examples/platform/nxp/se05x/linux/BUILD.gn b/examples/platform/nxp/se05x/linux/BUILD.gn
index 8ca63ddd853..a403df6efc1 100644
--- a/examples/platform/nxp/se05x/linux/BUILD.gn
+++ b/examples/platform/nxp/se05x/linux/BUILD.gn
@@ -20,6 +20,7 @@ import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/lib/core/core.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/nxp/crypto/se05x/args.gni")
+import("${chip_root}/src/system/system.gni")
 import("${chip_root}/src/tracing/tracing_args.gni")
 
 if (current_os != "nuttx") {
@@ -32,12 +33,14 @@ declare_args() {
   chip_enable_smoke_co_trigger = false
   chip_enable_boolean_state_configuration_trigger = false
   chip_enable_commodity_price_trigger = false
+  chip_enable_commodity_tariff_trigger = false
   chip_enable_energy_evse_trigger = false
   chip_enable_electrical_grid_conditions_trigger = false
   chip_enable_energy_reporting_trigger = false
   chip_enable_meter_identification_trigger = false
   chip_enable_water_heater_management_trigger = false
   chip_enable_device_energy_management_trigger = false
+  chip_enable_commodity_metering_trigger = false
 }
 
 config("app-main-config") {
@@ -99,6 +102,83 @@ source_set("device-energy-management-test-event-trigger") {
   sources = [ "${chip_root}/src/app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h" ]
 }
 
+source_set("commodity-metering-test-event-trigger") {
+  sources = [ "${chip_root}/src/app/clusters/commodity-metering-server/CommodityMeteringTestEventTriggerHandler.h" ]
+}
+
+source_set("linux-commissionable-data-provider") {
+  sources = [
+    "../../../linux/LinuxCommissionableDataProvider.h",
+    "LinuxCommissionableDataProvider_se05x.cpp",
+  ]
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/platform",
+  ]
+
+  defines = []
+
+  if (chip_se05x_spake_verifier_use_tp_values) {
+    defines += [ "ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES=1" ]
+  }
+
+  defines +=
+      [ "SE05X_SPAKE_VERIFIER_TP_SET_NO=$chip_se05x_spake_verifier_tp_set_no" ]
+
+  deps = [ "${chip_root}/third_party/simw-top-mini:se05x" ]
+
+  public_configs = [ ":app-main-config" ]
+}
+
+source_set("commodity-tariff-test-event-trigger") {
+  sources = [ "${chip_root}/src/app/clusters/commodity-tariff-server/CommodityTariffTestEventTriggerHandler.h" ]
+}
+
+source_set("app-main-loop") {
+  sources = [ "../../../linux/AppMainLoop.h" ]
+
+  public_configs = [ ":app-main-config" ]
+}
+
+source_set("app-options") {
+  defines = [
+    "ENABLE_TRACING=${matter_enable_tracing_support}",
+    "ENABLE_CAMERA_SERVER=${matter_enable_camera_server}",
+    "CHIP_ATTESTATION_TRUSTY_OS=${chip_with_trusty_os}",
+  ]
+
+  sources = [
+    "../../../linux/Options.cpp",
+    "../../../linux/Options.h",
+    "../../../linux/testing/CustomCSRResponse.cpp",
+    "../../../linux/testing/CustomCSRResponse.h",
+    "../../../linux/testing/CustomCSRResponseOperationalKeyStore.cpp",
+    "../../../linux/testing/CustomCSRResponseOperationalKeyStore.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
+    "${chip_root}/src/lib",
+    "${chip_root}/src/lib/support:arg_parser",
+  ]
+
+  if (matter_enable_tracing_support) {
+    public_deps += [
+      "${chip_root}/examples/common/tracing:commandline",
+      "${chip_root}/src/tracing",
+    ]
+  }
+  if (current_os != "nuttx") {
+    public_deps += [ jsoncpp_root ]
+  }
+  if (chip_enable_pw_rpc) {
+    defines += [ "PW_RPC_ENABLED" ]
+  }
+
+  public_configs = [ ":app-main-config" ]
+}
+
 source_set("app-main") {
   defines = [
     "ENABLE_TRACING=${matter_enable_tracing_support}",
@@ -110,32 +190,40 @@ source_set("app-main") {
     defines += [ "ENABLE_SE05X_DEVICE_ATTESTATION=1" ]
   }
 
+  if (chip_se05x_spake_verifier_use_tp_values) {
+    defines += [ "ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES=1" ]
+  }
+
+  defines +=
+      [ "SE05X_SPAKE_VERIFIER_TP_SET_NO=$chip_se05x_spake_verifier_tp_set_no" ]
+
+  defines += [
+    "SE05X_SPAKE_VERIFIER_TP_ITER_CNT=$chip_se05x_spake_verifier_tp_iter_cnt",
+  ]
+
   sources = [
     "../../../linux/AppMain.h",
     "../../../linux/CommissionableInit.cpp",
     "../../../linux/CommissionableInit.h",
-    "../../../linux/LinuxCommissionableDataProvider.cpp",
-    "../../../linux/LinuxCommissionableDataProvider.h",
     "../../../linux/NamedPipeCommands.cpp",
     "../../../linux/NamedPipeCommands.h",
-    "../../../linux/Options.cpp",
-    "../../../linux/Options.h",
-    "../../../linux/testing/CustomCSRResponse.cpp",
-    "../../../linux/testing/CustomCSRResponse.h",
-    "../../../linux/testing/CustomCSRResponseOperationalKeyStore.cpp",
-    "../../../linux/testing/CustomCSRResponseOperationalKeyStore.h",
     "../DeviceAttestationSe05xCredsExample.cpp",
     "AppMain.cpp",
   ]
 
   public_deps = [
+    ":app-main-loop",
+    ":app-options",
     ":boolean-state-configuration-test-event-trigger",
     ":commissioner-main",
+    ":commodity-metering-test-event-trigger",
     ":commodity-price-test-event-trigger",
+    ":commodity-tariff-test-event-trigger",
     ":device-energy-management-test-event-trigger",
     ":electrical-grid-conditions-test-event-trigger",
     ":energy-evse-test-event-trigger",
     ":energy-reporting-test-event-trigger",
+    ":linux-commissionable-data-provider",
     ":meter-identification-test-event-trigger",
     ":smco-test-event-trigger",
     ":software-diagnostics-test-event-trigger",
@@ -143,20 +231,17 @@ source_set("app-main") {
     ":wifi-diagnostics-test-event-trigger",
     "${chip_root}/src/data-model-providers/codegen:instance-header",
     "${chip_root}/src/lib",
-    "${chip_root}/src/platform/logging:stdio",
+    "${chip_root}/src/platform/logging:default",
   ]
   deps = [
     ":ota-test-event-trigger",
     "${chip_root}/examples/providers:all_clusters_device_info_provider",
     "${chip_root}/examples/providers:device_info_provider_please_do_not_reuse_as_is",
     "${chip_root}/src/app/server",
-    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/setup_payload:onboarding-codes-utils",
   ]
 
-  if (current_os != "nuttx") {
-    public_deps += [ jsoncpp_root ]
-  }
+  deps += [ "${chip_root}/third_party/simw-top-mini:se05x" ]
 
   if (chip_enable_pw_rpc) {
     defines += [ "PW_RPC_ENABLED" ]
@@ -192,15 +277,20 @@ source_set("app-main") {
     "CHIP_DEVICE_CONFIG_ENABLE_BOOLEAN_STATE_CONFIGURATION_TRIGGER=${chip_enable_boolean_state_configuration_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_PRICE_TRIGGER=${chip_enable_commodity_price_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_ELECTRICAL_GRID_CONDITIONS_TRIGGER=${chip_enable_electrical_grid_conditions_trigger}",
+    "CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_TARIFF_TRIGGER=${chip_enable_commodity_tariff_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_ENERGY_EVSE_TRIGGER=${chip_enable_energy_evse_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER=${chip_enable_energy_reporting_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_METER_IDENTIFICATION_TRIGGER=${chip_enable_meter_identification_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_WATER_HEATER_MANAGEMENT_TRIGGER=${chip_enable_water_heater_management_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_WIFI_DIAGNOSTIC_TRIGGER=${chip_enable_wifi_diagnostics_trigger}",
     "CHIP_DEVICE_CONFIG_ENABLE_DEVICE_ENERGY_MANAGEMENT_TRIGGER=${chip_enable_device_energy_management_trigger}",
+    "CHIP_DEVICE_CONFIG_ENABLE_COMMODITY_METERING_TRIGGER=${chip_enable_commodity_metering_trigger}",
   ]
 
-  deps += [ "${chip_root}/third_party/simw-top-mini:se05x" ]
+  if (chip_system_config_use_openthread_inet_endpoints) {
+    deps += [ "${chip_root}/third_party/openthread/platforms/simulation" ]
+  }
+
   public_configs = [ ":app-main-config" ]
 }
 
diff --git a/examples/platform/nxp/se05x/linux/LinuxCommissionableDataProvider_se05x.cpp b/examples/platform/nxp/se05x/linux/LinuxCommissionableDataProvider_se05x.cpp
new file mode 100644
index 00000000000..76f36f78fc2
--- /dev/null
+++ b/examples/platform/nxp/se05x/linux/LinuxCommissionableDataProvider_se05x.cpp
@@ -0,0 +1,287 @@
+/*
+ *
+ *    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 "LinuxCommissionableDataProvider.h"
+
+#include <string.h>
+
+#include <crypto/CHIPCryptoPAL.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/Span.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h>
+
+using namespace chip::Crypto;
+
+namespace {
+
+#if ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+
+constexpr size_t kSpake2p_PBKDF_Salt_Length_SE05x = 32;
+constexpr size_t kSpake2p_Passcode_Length_SE05x   = 4;
+constexpr uint32_t kSpake2p_Pwd_Salt_Bin_File_id  = 0x7FFF2000;
+uint32_t setUpPINCode_se05x                       = 0;
+
+#define BCD_TO_DEC(x) (x - 6 * (x >> 4))
+
+CHIP_ERROR GeneratePaseSalt(std::vector<uint8_t> & spake2pSaltVector)
+{
+    CHIP_ERROR err            = CHIP_NO_ERROR;
+    constexpr size_t kSaltLen = kSpake2p_PBKDF_Salt_Length_SE05x;
+    uint8_t cert[128]         = {
+        0,
+    };
+    size_t certLen = sizeof(cert);
+    /* 3 set of verifiers are provisioned in se05x. Each with 4 bytes passcode and 32 bytes salt */
+    uint8_t offset = (SE05X_SPAKE_VERIFIER_TP_SET_NO - 1) * (kSpake2p_PBKDF_Salt_Length_SE05x + kSpake2p_Passcode_Length_SE05x);
+
+    err = se05x_get_certificate(kSpake2p_Pwd_Salt_Bin_File_id, cert, &certLen);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err);
+
+    // To ensure we turn off the gpio and be ready for NFC comm
+    VerifyOrReturnError(se05x_close_session() == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
+
+    VerifyOrReturnError(certLen >= (offset + kSpake2p_PBKDF_Salt_Length_SE05x + kSpake2p_Passcode_Length_SE05x),
+                        CHIP_ERROR_INTERNAL);
+
+    spake2pSaltVector.resize(kSaltLen);
+    memcpy(spake2pSaltVector.data(), cert + offset + kSpake2p_Passcode_Length_SE05x, kSaltLen);
+
+    setUpPINCode_se05x = (BCD_TO_DEC(cert[offset + 3])) + (100 * BCD_TO_DEC(cert[offset + 2])) +
+        (10000 * BCD_TO_DEC(cert[offset + 1])) + (1000000 * BCD_TO_DEC(cert[offset]));
+
+    return CHIP_NO_ERROR;
+}
+
+#else
+CHIP_ERROR GeneratePaseSalt(std::vector<uint8_t> & spake2pSaltVector)
+{
+    constexpr size_t kSaltLen = kSpake2p_Max_PBKDF_Salt_Length;
+    spake2pSaltVector.resize(kSaltLen);
+    return DRBG_get_bytes(spake2pSaltVector.data(), spake2pSaltVector.size());
+}
+#endif
+
+} // namespace
+
+CHIP_ERROR LinuxCommissionableDataProvider::Init(chip::Optional<std::vector<uint8_t>> serializedSpake2pVerifier,
+                                                 chip::Optional<std::vector<uint8_t>> spake2pSalt, uint32_t spake2pIterationCount,
+                                                 chip::Optional<uint32_t> setupPasscode, uint16_t discriminator)
+{
+    VerifyOrReturnError(mIsInitialized == false, CHIP_ERROR_UNINITIALIZED);
+
+    if (discriminator > chip::kMaxDiscriminatorValue)
+    {
+        ChipLogError(Support, "Discriminator value invalid: %u", static_cast<unsigned>(discriminator));
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    if ((spake2pIterationCount < kSpake2p_Min_PBKDF_Iterations) || (spake2pIterationCount > kSpake2p_Max_PBKDF_Iterations))
+    {
+        ChipLogError(Support, "PASE Iteration count invalid: %u", static_cast<unsigned>(spake2pIterationCount));
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+#if ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+    /* When using the trust provisioned verifiers, the possible values of iterationCount are 1000, 5000, 10000, 50000, 100000 */
+    if (!(spake2pIterationCount == 1000 || spake2pIterationCount == 5000 || spake2pIterationCount == 10000 ||
+          spake2pIterationCount == 50000 || spake2pIterationCount == 100000))
+    {
+        ChipLogError(Support,
+                     "When using the trust provisioned verifiers, the possible values of iterationCount are 1000, 5000, 10000, "
+                     "50000, 100000");
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+#endif
+
+    bool havePaseVerifier = serializedSpake2pVerifier.HasValue();
+    Spake2pVerifier providedVerifier;
+    CHIP_ERROR err;
+    std::vector<uint8_t> finalSerializedVerifier(kSpake2p_VerifierSerialized_Length);
+    if (havePaseVerifier)
+    {
+        if (serializedSpake2pVerifier.Value().size() != kSpake2p_VerifierSerialized_Length)
+        {
+            ChipLogError(Support, "PASE verifier size invalid: %zu", (serializedSpake2pVerifier.Value().size()));
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
+
+        chip::MutableByteSpan verifierSpan{ serializedSpake2pVerifier.Value().data(), serializedSpake2pVerifier.Value().size() };
+        err = providedVerifier.Deserialize(verifierSpan);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Support, "Failed to deserialized PASE verifier: %" CHIP_ERROR_FORMAT, err.Format());
+            return err;
+        }
+
+        ChipLogProgress(Support, "Got externally provided verifier, using it.");
+    }
+
+    bool havePaseSalt = spake2pSalt.HasValue();
+    if (havePaseVerifier && !havePaseSalt)
+    {
+        ChipLogError(Support, "LinuxCommissionableDataProvider didn't get a PASE salt, but got a verifier: ambiguous data");
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    size_t spake2pSaltLength = havePaseSalt ? spake2pSalt.Value().size() : 0;
+    if (havePaseSalt &&
+        ((spake2pSaltLength < kSpake2p_Min_PBKDF_Salt_Length) || (spake2pSaltLength > kSpake2p_Max_PBKDF_Salt_Length)))
+    {
+        ChipLogError(Support, "PASE salt length invalid: %u", static_cast<unsigned>(spake2pSaltLength));
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    if (!havePaseSalt)
+    {
+        ChipLogProgress(Support, "LinuxCommissionableDataProvider didn't get a PASE salt, generating one.");
+        std::vector<uint8_t> spake2pSaltVector;
+        err = GeneratePaseSalt(spake2pSaltVector);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Support, "Failed to generate PASE salt: %" CHIP_ERROR_FORMAT, err.Format());
+            return err;
+        }
+        spake2pSalt.SetValue(std::move(spake2pSaltVector));
+    }
+
+    bool havePasscode = setupPasscode.HasValue();
+    std::vector<uint8_t> serializedPasscodeVerifier(kSpake2p_VerifierSerialized_Length);
+    chip::MutableByteSpan saltSpan{ spake2pSalt.Value().data(), spake2pSalt.Value().size() };
+    if (havePasscode)
+    {
+#if ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+        ChipLogError(
+            Support,
+            "*** WARNING: Overriding the passcode (default / passcode from command line) with value provisioned in SE05x *** ");
+        setupPasscode.SetValue(setUpPINCode_se05x);
+#else
+        Spake2pVerifier passcodeVerifier{};
+        err = passcodeVerifier.Generate(spake2pIterationCount, saltSpan, setupPasscode.Value());
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Support, "Failed to generate PASE verifier from passcode: %" CHIP_ERROR_FORMAT, err.Format());
+            return err;
+        }
+
+        chip::MutableByteSpan verifierSpan{ serializedPasscodeVerifier.data(), serializedPasscodeVerifier.size() };
+        err = passcodeVerifier.Serialize(verifierSpan);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Support, "Failed to serialize PASE verifier from passcode: %" CHIP_ERROR_FORMAT, err.Format());
+            return err;
+        }
+#endif
+    }
+
+    // Make sure we actually have a verifier
+    if (!havePasscode && !havePaseVerifier)
+    {
+        ChipLogError(Support, "Missing both externally provided verifier and passcode: cannot produce final verifier");
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    // If both passcode and external verifier were provided, validate they match, otherwise
+    // it's ambiguous.
+    if (havePasscode && havePaseVerifier)
+    {
+        if (serializedPasscodeVerifier != serializedSpake2pVerifier.Value())
+        {
+            ChipLogError(Support, "Mismatching verifier between passcode and external verifier. Validate inputs.");
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
+        ChipLogProgress(Support, "Validated externally provided passcode matches the one generated from provided passcode.");
+    }
+
+    // External PASE verifier takes precedence when present (even though it is identical to passcode-based
+    // one when the latter is present).
+    if (havePaseVerifier)
+    {
+        finalSerializedVerifier = serializedSpake2pVerifier.Value();
+    }
+    else
+    {
+        finalSerializedVerifier = serializedPasscodeVerifier;
+    }
+
+    mDiscriminator          = discriminator;
+    mSerializedPaseVerifier = std::move(finalSerializedVerifier);
+    mPaseSalt               = std::move(spake2pSalt.Value());
+    mPaseIterationCount     = spake2pIterationCount;
+    if (havePasscode)
+    {
+        mSetupPasscode.SetValue(setupPasscode.Value());
+    }
+    mIsInitialized = true;
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LinuxCommissionableDataProvider::GetSetupDiscriminator(uint16_t & setupDiscriminator)
+{
+    VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
+    setupDiscriminator = mDiscriminator;
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pIterationCount(uint32_t & iterationCount)
+{
+    VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
+    iterationCount = mPaseIterationCount;
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pSalt(chip::MutableByteSpan & saltBuf)
+{
+    VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
+
+    VerifyOrReturnError(saltBuf.size() >= kSpake2p_Max_PBKDF_Salt_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(saltBuf.data(), mPaseSalt.data(), mPaseSalt.size());
+    saltBuf.reduce_size(mPaseSalt.size());
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pVerifier(chip::MutableByteSpan & verifierBuf, size_t & outVerifierLen)
+{
+    VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
+
+    // By now, serialized verifier from Init should be correct size
+    VerifyOrReturnError(mSerializedPaseVerifier.size() == kSpake2p_VerifierSerialized_Length, CHIP_ERROR_INTERNAL);
+
+    outVerifierLen = mSerializedPaseVerifier.size();
+    VerifyOrReturnError(verifierBuf.size() >= outVerifierLen, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(verifierBuf.data(), mSerializedPaseVerifier.data(), mSerializedPaseVerifier.size());
+    verifierBuf.reduce_size(mSerializedPaseVerifier.size());
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LinuxCommissionableDataProvider::GetSetupPasscode(uint32_t & setupPasscode)
+{
+    VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
+
+    // Pretend not implemented if we don't have a passcode value externally set
+    if (!mSetupPasscode.HasValue())
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+
+    setupPasscode = mSetupPasscode.Value();
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
index ace0c47c5a3..396c9bc23df 100644
--- a/examples/platform/silabs/MatterConfig.cpp
+++ b/examples/platform/silabs/MatterConfig.cpp
@@ -288,6 +288,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     ReturnErrorOnFailure(provision.Init());
     SetDeviceInstanceInfoProvider(&provision.GetStorage());
     SetCommissionableDataProvider(&provision.GetStorage());
+    SetDeviceAttestationCredentialsProvider(&provision.GetStorage());
     ChipLogProgress(DeviceLayer, "Provision mode %s", provision.IsProvisionRequired() ? "ENABLED" : "disabled");
 
     // Create initParams with SDK example defaults here
diff --git a/examples/platform/telink/common.cmake b/examples/platform/telink/common.cmake
index 7b4a2390479..a414c050ba3 100644
--- a/examples/platform/telink/common.cmake
+++ b/examples/platform/telink/common.cmake
@@ -128,8 +128,10 @@ endif()
 
 if(${CONFIG_COMPRESS_LZMA} MATCHES y)
   set(BOOT_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader_compress_lzma.conf")
+  set(FLASH_LAYOUT_SUFFIX "_lzma")
 else()
   set(BOOT_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
+  set(FLASH_LAYOUT_SUFFIX "")
 endif()
 if(NOT EXISTS "${BOOT_CONF_OVERLAY_FILE}")
   message(FATAL_ERROR "${BOOT_CONF_OVERLAY_FILE} doesn't exist")
@@ -164,7 +166,7 @@ if(NOT EXISTS "${GLOBAL_DTC_OVERLAY_FILE}")
   unset(GLOBAL_DTC_OVERLAY_FILE)
 endif()
 
-set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_${FLASH_SIZE}_flash.overlay")
+set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_${FLASH_SIZE}_flash${FLASH_LAYOUT_SUFFIX}.overlay")
 if(NOT EXISTS "${FLASH_DTC_OVERLAY_FILE}")
   message(STATUS "${FLASH_DTC_OVERLAY_FILE} doesn't exist")
   unset(FLASH_DTC_OVERLAY_FILE)
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index fe3823d80e8..98b9d35b718 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -1378,7 +1378,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1829,7 +1828,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1838,6 +1842,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1862,12 +1867,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1894,13 +1906,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2155,7 +2167,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2278,6 +2290,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2360,6 +2373,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2477,15 +2491,15 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index b5551d5b0dd..12e818f900b 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1668,6 +1668,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2725,6 +2741,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index df1ea69d423..e3a8c50e230 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -1378,7 +1378,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1829,7 +1828,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1838,6 +1842,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1862,12 +1867,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1894,13 +1906,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2155,7 +2167,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2278,6 +2290,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2360,6 +2373,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2477,15 +2491,15 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap
index 7118489c2d9..b18356a9caf 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1668,6 +1668,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2725,6 +2741,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index df1ea69d423..e3a8c50e230 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -1378,7 +1378,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1829,7 +1828,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1838,6 +1842,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1862,12 +1867,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1894,13 +1906,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2155,7 +2167,7 @@ cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2278,6 +2290,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2360,6 +2373,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2477,15 +2491,15 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 0x8000;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster PressureMeasurement {
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
index a89ae21bb83..83c753777bd 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1668,6 +1668,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2725,6 +2741,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index 80601df446d..fa82fbdf89a 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -1255,7 +1255,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1706,7 +1705,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1715,6 +1719,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1739,12 +1744,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1771,13 +1783,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1959,7 +1971,7 @@ cluster FlowMeasurement = 1028 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2082,6 +2094,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2164,6 +2177,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index 9f64dd7b9e1..3e6ca4d9220 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1668,6 +1668,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2725,6 +2741,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/rangehood-app/silabs/data_model/rangehood-wifi-app.matter b/examples/rangehood-app/silabs/data_model/rangehood-wifi-app.matter
index 4526d21b049..54c9301e68b 100644
--- a/examples/rangehood-app/silabs/data_model/rangehood-wifi-app.matter
+++ b/examples/rangehood-app/silabs/data_model/rangehood-wifi-app.matter
@@ -1370,7 +1370,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1766,7 +1765,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1775,6 +1779,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1799,12 +1804,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1831,13 +1843,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
index 408591e44d0..5f3f4c4f8cc 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -989,7 +989,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1349,7 +1348,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1358,6 +1362,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1382,12 +1387,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1414,13 +1426,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1456,7 +1468,7 @@ cluster TemperatureControl = 86 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1578,6 +1590,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1655,6 +1668,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
index b308720d13c..eaf3c578b36 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1609,6 +1609,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2590,6 +2606,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter
index c43a5363c4a..5377667d8db 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter
@@ -1235,7 +1235,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1686,7 +1685,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1695,6 +1699,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1719,12 +1724,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1751,13 +1763,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1869,7 +1881,7 @@ cluster RefrigeratorAlarm = 87 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -1997,6 +2009,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2076,6 +2089,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
index 9b03332e572..a64ea78c618 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1740,6 +1740,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2800,6 +2816,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter
index 17a89daf7f7..f599ca9aebf 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter
@@ -1235,7 +1235,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1595,7 +1594,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1604,6 +1608,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1628,12 +1633,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1660,13 +1672,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1778,7 +1790,7 @@ cluster RefrigeratorAlarm = 87 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -1905,6 +1917,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1982,6 +1995,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
index 7933f8e179a..30913cb354e 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1724,6 +1724,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2705,6 +2721,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 96f82536f5c..0e5ebe62f03 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -1074,7 +1074,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1358,7 +1357,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1367,6 +1371,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1391,12 +1396,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1423,13 +1435,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1742,7 +1754,7 @@ cluster ServiceArea = 336 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1852,6 +1864,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1900,6 +1913,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index ee26b0f3187..cea0a14d85e 100644
--- a/examples/rvc-app/rvc-common/rvc-app.zap
+++ b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1413,6 +1413,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1994,6 +2010,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp b/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
index 62fe8df442d..cc138b93efe 100644
--- a/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
+++ b/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
@@ -30,11 +30,13 @@ using namespace chip::DeviceLayer;
 SmokeCoAlarmManager SmokeCoAlarmManager::sAlarm;
 
 static std::array<ExpressedStateEnum, SmokeCoAlarmServer::kPriorityOrderLength> sPriorityOrder = {
-    ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke, ExpressedStateEnum::kCOAlarm,
-    ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,     ExpressedStateEnum::kTesting,
-    ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
+    ExpressedStateEnum::kInoperative, ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke,
+    ExpressedStateEnum::kCOAlarm,     ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,
+    ExpressedStateEnum::kTesting,     ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
 };
 
+constexpr chip::EndpointId kSmokeCoAlarmEndpointId = 1;
+
 CHIP_ERROR SmokeCoAlarmManager::Init()
 {
     // Create cmsisos sw timer for alarm timer.
@@ -52,7 +54,7 @@ CHIP_ERROR SmokeCoAlarmManager::Init()
 
     // read current State on endpoint one
     chip::DeviceLayer::PlatformMgr().LockChipStack();
-    SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+    SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     mEndSelfTesting = false;
@@ -110,8 +112,8 @@ void SmokeCoAlarmManager::EndSelfTestingEventHandler(AppEvent * aEvent)
     AlarmMgr().mEndSelfTesting = false;
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
-    SmokeCoAlarmServer::Instance().SetTestInProgress(1, false);
-    SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+    SmokeCoAlarmServer::Instance().SetTestInProgress(kSmokeCoAlarmEndpointId, false);
+    SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     SILABS_LOG("End self-testing!");
@@ -126,120 +128,149 @@ CHIP_ERROR SmokeCoAlarmManager::HandleEventTrigger(uint64_t eventTrigger)
     {
     case SmokeCOTrigger::kForceSmokeCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kCritical),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kWarning),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke interconnect (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(
+            SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(kSmokeCoAlarmEndpointId, AlarmStateEnum::kWarning),
+            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kCritical),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kWarning),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(
+            SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(kSmokeCoAlarmEndpointId, AlarmStateEnum::kWarning),
+            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeContaminationHigh:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke contamination (critical)");
-        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kCritical);
+        SmokeCoAlarmServer::Instance().SetContaminationState(kSmokeCoAlarmEndpointId, ContaminationStateEnum::kCritical);
         break;
     case SmokeCOTrigger::kForceSmokeContaminationLow:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke contamination (warning)");
-        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kLow);
+        SmokeCoAlarmServer::Instance().SetContaminationState(kSmokeCoAlarmEndpointId, ContaminationStateEnum::kLow);
         break;
     case SmokeCOTrigger::kForceSmokeSensitivityHigh:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke sensistivity (high)");
-        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kHigh);
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(kSmokeCoAlarmEndpointId, SensitivityEnum::kHigh);
         break;
     case SmokeCOTrigger::kForceSmokeSensitivityLow:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke sensitivity (low)");
-        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kLow);
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(kSmokeCoAlarmEndpointId, SensitivityEnum::kLow);
         break;
     case SmokeCOTrigger::kForceMalfunction:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force malfunction");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, true), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(kSmokeCoAlarmEndpointId, true), CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceLowBatteryWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(kSmokeCoAlarmEndpointId, AlarmStateEnum::kWarning),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceLowBatteryCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(kSmokeCoAlarmEndpointId, AlarmStateEnum::kCritical),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceEndOfLife:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force end-of-life");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kExpired), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(
+            SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(kSmokeCoAlarmEndpointId, EndOfServiceEnum::kExpired),
+            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSilence:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force silence");
-        SmokeCoAlarmServer::Instance().SetDeviceMuted(1, MuteStateEnum::kMuted);
+        SmokeCoAlarmServer::Instance().SetDeviceMuted(kSmokeCoAlarmEndpointId, MuteStateEnum::kMuted);
         break;
     case SmokeCOTrigger::kClearSmoke:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kNormal),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearCO:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(kSmokeCoAlarmEndpointId, AlarmStateEnum::kNormal),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearSmokeInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke interconnect");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(
+            SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(kSmokeCoAlarmEndpointId, AlarmStateEnum::kNormal),
+            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearCOInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO interconnect");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(kSmokeCoAlarmEndpointId, AlarmStateEnum::kNormal),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearMalfunction:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear malfunction");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, false), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(kSmokeCoAlarmEndpointId, false), CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearEndOfLife:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear end-of-life");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(kSmokeCoAlarmEndpointId, EndOfServiceEnum::kNormal),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearSilence:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear silence");
-        SmokeCoAlarmServer::Instance().SetDeviceMuted(1, MuteStateEnum::kNotMuted);
+        SmokeCoAlarmServer::Instance().SetDeviceMuted(kSmokeCoAlarmEndpointId, MuteStateEnum::kNotMuted);
         break;
     case SmokeCOTrigger::kClearBatteryLevelLow:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear low battery");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
-        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(kSmokeCoAlarmEndpointId, AlarmStateEnum::kNormal),
+                            CHIP_NO_ERROR);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearContamination:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force SmokeContamination (warning)");
-        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kNormal);
+        SmokeCoAlarmServer::Instance().SetContaminationState(kSmokeCoAlarmEndpointId, ContaminationStateEnum::kNormal);
         break;
     case SmokeCOTrigger::kClearSensitivity:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Smoke Sensitivity");
-        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kStandard);
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(kSmokeCoAlarmEndpointId, SensitivityEnum::kStandard);
+        break;
+    case SmokeCOTrigger::kForceUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(kSmokeCoAlarmEndpointId, true), CHIP_ERROR_INTERNAL);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearUnmountedState:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Unmounted State");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetUnmountedState(kSmokeCoAlarmEndpointId, false), CHIP_ERROR_INTERNAL);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(kSmokeCoAlarmEndpointId, sPriorityOrder);
         break;
     default:
 
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 2abde9fb174..7a7d673b024 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1544,7 +1544,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2031,7 +2030,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2040,6 +2044,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2064,12 +2069,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2096,13 +2108,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2222,7 +2234,7 @@ cluster IcdManagement = 70 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 cluster SmokeCoAlarm = 92 {
-  revision 1;
+  revision 2;
 
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
@@ -2252,6 +2264,7 @@ cluster SmokeCoAlarm = 92 {
     kEndOfService = 6;
     kInterconnectSmoke = 7;
     kInterconnectCO = 8;
+    kInoperative = 9;
   }
 
   enum MuteStateEnum : enum8 {
@@ -2321,6 +2334,7 @@ cluster SmokeCoAlarm = 92 {
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
   attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
+  provisional readonly attribute optional boolean unmounted = 13;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2332,7 +2346,7 @@ cluster SmokeCoAlarm = 92 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2441,6 +2455,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2567,6 +2582,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -2684,6 +2700,7 @@ endpoint 1 {
     ram      attribute contaminationState default = 0;
     ram      attribute smokeSensitivityLevel default = 1;
     ram      attribute expiryDate default = 0;
+    ram      attribute unmounted default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
index 16824d3b166..6be95fa7538 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1449,6 +1449,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3149,6 +3165,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -3214,10 +3246,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3230,10 +3262,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3450,10 +3482,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4372,6 +4404,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "Unmounted",
+              "code": 13,
+              "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": "GeneratedCommandList",
               "code": 65528,
diff --git a/examples/smoke-co-alarm-app/telink/src/SmokeCoAlarmManager.cpp b/examples/smoke-co-alarm-app/telink/src/SmokeCoAlarmManager.cpp
index e97d6e95d3c..6569dbc3734 100644
--- a/examples/smoke-co-alarm-app/telink/src/SmokeCoAlarmManager.cpp
+++ b/examples/smoke-co-alarm-app/telink/src/SmokeCoAlarmManager.cpp
@@ -28,9 +28,9 @@ LOG_MODULE_DECLARE(COsensor, CONFIG_CHIP_APP_LOG_LEVEL);
 SmokeCoAlarmManager SmokeCoAlarmManager::sAlarm;
 
 static std::array<ExpressedStateEnum, SmokeCoAlarmServer::kPriorityOrderLength> sPriorityOrder = {
-    ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke, ExpressedStateEnum::kCOAlarm,
-    ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,     ExpressedStateEnum::kTesting,
-    ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
+    ExpressedStateEnum::kInoperative, ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke,
+    ExpressedStateEnum::kCOAlarm,     ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,
+    ExpressedStateEnum::kTesting,     ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
 };
 
 CHIP_ERROR SmokeCoAlarmManager::Init()
diff --git a/examples/temperature-measurement-app/asr/src/DeviceCallbacks.cpp b/examples/temperature-measurement-app/asr/src/DeviceCallbacks.cpp
index 3dac2a62689..d7504bb148f 100644
--- a/examples/temperature-measurement-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/temperature-measurement-app/asr/src/DeviceCallbacks.cpp
@@ -34,6 +34,7 @@
 #if defined CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT || defined CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT
 #include "route_hook/asr_route_hook.h"
 #endif
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 
 constexpr uint32_t kReportDelaySec = 3;
 
@@ -92,14 +93,13 @@ void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Cluster
 
 void TempMeas(System::Layer * systemLayer, void * appState)
 {
-
     int16_t temperature = 2550;
     int16_t humidity    = 5000;
 
     ASR_LOG("Sensor T:%d H:%d", temperature, humidity);
 
-    chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(
-        /* endpoint ID */ 1, /* temperature in 0.01*C */ int16_t(temperature));
+    LogErrorOnFailure(
+        app::Clusters::TemperatureMeasurement::SetMeasuredValue(/* endpoint ID */ 1, /* temperature in 0.01*C */ temperature));
 
     // chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(
     //     /* endpoint ID */ 1, /* humidity in 0.01*C */ int16_t(humidity));
diff --git a/examples/temperature-measurement-app/telink/src/AppTask.cpp b/examples/temperature-measurement-app/telink/src/AppTask.cpp
index df1c5f6dc20..f6431f3e936 100644
--- a/examples/temperature-measurement-app/telink/src/AppTask.cpp
+++ b/examples/temperature-measurement-app/telink/src/AppTask.cpp
@@ -18,6 +18,7 @@
 
 #include "AppTask.h"
 #include "SensorManagerCommon.h"
+#include <app/clusters/temperature-measurement-server/CodegenIntegration.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
@@ -47,10 +48,8 @@ CHIP_ERROR AppTask::Init(void)
     k_timer_start(&sTemperatureMeasurementUpdateTimer, K_MSEC(kTemperatureMeasurementUpdateTimerPeriodMs), K_NO_WAIT);
 
     PlatformMgr().LockChipStack();
-    app::Clusters::TemperatureMeasurement::Attributes::MinMeasuredValue::Set(kExampleEndpointId,
-                                                                             SensorMgr().GetMinMeasuredTempValue());
-    app::Clusters::TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(kExampleEndpointId,
-                                                                             SensorMgr().GetMaxMeasuredTempValue());
+    LogErrorOnFailure(chip::app::Clusters::TemperatureMeasurement::SetMeasuredValueRange(
+        kExampleEndpointId, SensorMgr().GetMinMeasuredTempValue(), SensorMgr().GetMaxMeasuredTempValue()));
     PlatformMgr().UnlockChipStack();
 
     return CHIP_NO_ERROR;
@@ -89,7 +88,7 @@ void AppTask::TemperatureMeasurementUpdateTimerEventHandler(AppEvent * aEvent)
     LOG_INF("Current temperature is (%d*0.01)°C", temperature);
 
     PlatformMgr().LockChipStack();
-    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(kExampleEndpointId, temperature);
+    LogErrorOnFailure(chip::app::Clusters::TemperatureMeasurement::SetMeasuredValue(kExampleEndpointId, temperature));
     PlatformMgr().UnlockChipStack();
 
     // Start next timer to handle temp sensor.
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index da72b276735..af9ab3627de 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -1187,7 +1187,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1624,7 +1623,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1633,6 +1637,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1657,12 +1662,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1689,13 +1701,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1732,7 +1744,7 @@ cluster TemperatureMeasurement = 1026 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1857,6 +1869,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1946,6 +1959,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1975,11 +1989,11 @@ endpoint 1 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue default = 2451;
+    callback attribute measuredValue;
     ram      attribute minMeasuredValue default = -8500;
     ram      attribute maxMeasuredValue default = 9900;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 4;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 }
 
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
index 496f8dd3d18..c22beaaeba7 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1610,6 +1610,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2678,6 +2694,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/template/silabs/template_DataModel_config/sl_template.matter b/examples/template/silabs/template_DataModel_config/sl_template.matter
index 5fff579e6f4..87a01a5ca69 100644
--- a/examples/template/silabs/template_DataModel_config/sl_template.matter
+++ b/examples/template/silabs/template_DataModel_config/sl_template.matter
@@ -1539,7 +1539,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2143,7 +2142,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2152,6 +2156,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2176,12 +2181,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2208,13 +2220,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter
index 278b4d545e1..ee42ede0f51 100644
--- a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter
+++ b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter
@@ -1159,7 +1159,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1443,7 +1442,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1452,6 +1456,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1476,12 +1481,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1508,18 +1520,18 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1611,6 +1623,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1657,6 +1670,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1670,7 +1684,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
diff --git a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
index 6057cba8717..016729bf7df 100644
--- a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
+++ b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1249,6 +1249,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1790,6 +1806,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -1894,7 +1926,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        4
       ],
       "deviceIdentifiers": [
         256
diff --git a/examples/thermostat/genio/src/AppTask.cpp b/examples/thermostat/genio/src/AppTask.cpp
index 7b9af2d64b1..1250b8baf7e 100644
--- a/examples/thermostat/genio/src/AppTask.cpp
+++ b/examples/thermostat/genio/src/AppTask.cpp
@@ -121,15 +121,16 @@ CHIP_ERROR AppTask::Init()
     sWiFiNetworkCommissioningInstance.Init();
 #endif
 
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
index 9b2b1613f0d..9057e181d41 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
@@ -1286,7 +1286,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1849,7 +1848,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1858,6 +1862,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1882,12 +1887,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1914,13 +1926,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2420,7 +2432,7 @@ cluster ThreadBorderRouterManagement = 1106 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2551,6 +2563,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2645,6 +2658,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.zap b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
index 80081a04bc1..3e956bfa6c3 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1746,6 +1746,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2918,6 +2934,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter
index 49104268c27..47bf1983127 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter
@@ -1286,7 +1286,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1606,7 +1605,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1615,6 +1619,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1639,12 +1644,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1671,13 +1683,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2152,7 +2164,7 @@ cluster Thermostat = 513 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2274,6 +2286,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2340,6 +2353,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_eth.zap b/examples/thermostat/nxp/zap/thermostat_matter_eth.zap
index 2835233a0fb..e6f1dd255cf 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_eth.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_eth.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1632,6 +1632,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2449,6 +2465,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 4ec602d1ccb..688f12939ef 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -1286,7 +1286,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1773,7 +1772,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1782,6 +1786,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1806,12 +1811,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1838,13 +1850,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2301,7 +2313,7 @@ cluster Thermostat = 513 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2433,6 +2445,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2573,6 +2586,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
index 5d04c7aeb94..e9329dd8e0d 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1762,6 +1762,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3679,6 +3695,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index a9ef4200568..ffc76af1549 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -1286,7 +1286,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1682,7 +1681,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1691,6 +1695,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1715,12 +1720,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1747,13 +1759,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2210,7 +2222,7 @@ cluster Thermostat = 513 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2341,6 +2353,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2435,6 +2448,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
index f8f2968a46a..9598552d7c8 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        3
+        5
       ],
       "deviceIdentifiers": [
         18,
@@ -1746,6 +1746,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2918,6 +2934,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/thermostat/nxp/zephyr/CMakeLists.txt b/examples/thermostat/nxp/zephyr/CMakeLists.txt
index 4836ddc8eb2..555f6032aab 100644
--- a/examples/thermostat/nxp/zephyr/CMakeLists.txt
+++ b/examples/thermostat/nxp/zephyr/CMakeLists.txt
@@ -19,6 +19,7 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 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(THERMOSTAT_NXP_COMMON_DIR ${CHIP_ROOT}/examples/thermostat/nxp/common REALPATH)
+get_filename_component(THERMOSTAT_NXP_ZAP_DIR ${CHIP_ROOT}/examples/thermostat/nxp/zap REALPATH)
 get_filename_component(EXAMPLE_PLATFORM_NXP_COMMON_DIR ${CHIP_ROOT}/examples/platform/nxp/common REALPATH)
 get_filename_component(EXAMPLE_PLATFORM_NXP_ZEPHYR_DIR ${CHIP_ROOT}/examples/platform/nxp/zephyr REALPATH)
 
@@ -97,9 +98,15 @@ if (CONFIG_CHIP_FACTORY_DATA)
     )
 endif()
 
-chip_configure_data_model(app
-    ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/../../thermostat/nxp/zap/thermostat_matter_wifi.zap
-)
+if(CONFIG_CHIP_WIFI)
+    chip_configure_data_model(app
+        ZAP_FILE ${THERMOSTAT_NXP_ZAP_DIR}/thermostat_matter_wifi.zap
+    )
+elseif(CONFIG_NET_L2_OPENTHREAD)
+    chip_configure_data_model(app
+        ZAP_FILE ${THERMOSTAT_NXP_ZAP_DIR}/thermostat_matter_thread.zap
+    )
+endif()
 
 if(CONFIG_CHIP_LIB_SHELL)
     target_compile_definitions(app PRIVATE ENABLE_CHIP_SHELL)
diff --git a/examples/thermostat/nxp/zephyr/prj_thread_ftd.conf b/examples/thermostat/nxp/zephyr/prj_thread_ftd.conf
new file mode 100644
index 00000000000..6ec4bb87a3b
--- /dev/null
+++ b/examples/thermostat/nxp/zephyr/prj_thread_ftd.conf
@@ -0,0 +1,19 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+# Enable OpenThread support
+CONFIG_NET_L2_OPENTHREAD=y
+CONFIG_CHIP_OPENTHREAD_FTD=y
\ No newline at end of file
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
index 8c921c56add..6af18ea7e3f 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
@@ -1544,7 +1544,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2031,7 +2030,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2040,6 +2044,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2064,12 +2069,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2096,13 +2108,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2689,7 +2701,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 1;
 
@@ -2850,6 +2862,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2985,6 +2998,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
index fd4fbff1aef..2525495c14a 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
@@ -68,7 +68,7 @@
         }
       ],
       "deviceVersions": [
-        3,
+        5,
         1,
         1
       ],
@@ -2164,6 +2164,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4009,6 +4025,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/thermostat/silabs/data_model/thermostat-thread-app.matter b/examples/thermostat/silabs/data_model/thermostat-thread-app.matter
index 3a160555961..fda64417695 100644
--- a/examples/thermostat/silabs/data_model/thermostat-thread-app.matter
+++ b/examples/thermostat/silabs/data_model/thermostat-thread-app.matter
@@ -1325,7 +1325,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1776,7 +1775,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1785,6 +1789,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1809,12 +1814,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1841,13 +1853,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 9c932fb3572..85980d2296a 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1397,7 +1397,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1802,6 +1801,153 @@ cluster EthernetNetworkDiagnostics = 55 {
   command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
+/** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
+cluster TimeSynchronization = 56 {
+  revision 2;
+
+  enum GranularityEnum : enum8 {
+    kNoTimeGranularity = 0;
+    kMinutesGranularity = 1;
+    kSecondsGranularity = 2;
+    kMillisecondsGranularity = 3;
+    kMicrosecondsGranularity = 4;
+  }
+
+  enum StatusCode : enum8 {
+    kTimeNotAccepted = 2;
+  }
+
+  enum TimeSourceEnum : enum8 {
+    kNone = 0;
+    kUnknown = 1;
+    kAdmin = 2;
+    kNodeTimeCluster = 3;
+    kNonMatterSNTP = 4;
+    kNonMatterNTP = 5;
+    kMatterSNTP = 6;
+    kMatterNTP = 7;
+    kMixedNTP = 8;
+    kNonMatterSNTPNTS = 9;
+    kNonMatterNTPNTS = 10;
+    kMatterSNTPNTS = 11;
+    kMatterNTPNTS = 12;
+    kMixedNTPNTS = 13;
+    kCloudSource = 14;
+    kPTP = 15 [spec_name = "PTP"];
+    kGNSS = 16 [spec_name = "GNSS"];
+  }
+
+  enum TimeZoneDatabaseEnum : enum8 {
+    kFull = 0;
+    kPartial = 1;
+    kNone = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kTimeZone = 0x1;
+    kNTPClient = 0x2;
+    kNTPServer = 0x4;
+    kTimeSyncClient = 0x8;
+  }
+
+  struct DSTOffsetStruct {
+    int32s offset = 0;
+    epoch_us validStarting = 1;
+    nullable epoch_us validUntil = 2;
+  }
+
+  struct FabricScopedTrustedTimeSourceStruct {
+    node_id nodeID = 0;
+    endpoint_no endpoint = 1;
+  }
+
+  struct TimeZoneStruct {
+    int32s offset = 0;
+    epoch_us validAt = 1;
+    optional char_string<64> name = 2;
+  }
+
+  struct TrustedTimeSourceStruct {
+    fabric_idx fabricIndex = 0;
+    node_id nodeID = 1;
+    endpoint_no endpoint = 2;
+  }
+
+  info event DSTTableEmpty = 0 {
+  }
+
+  info event DSTStatus = 1 {
+    boolean DSTOffsetActive = 0;
+  }
+
+  info event TimeZoneStatus = 2 {
+    int32s offset = 0;
+    optional char_string name = 1;
+  }
+
+  info event TimeFailure = 3 {
+  }
+
+  info event MissingTrustedTimeSource = 4 {
+  }
+
+  readonly attribute nullable epoch_us UTCTime = 0;
+  readonly attribute GranularityEnum granularity = 1;
+  readonly attribute optional TimeSourceEnum timeSource = 2;
+  readonly attribute optional nullable TrustedTimeSourceStruct trustedTimeSource = 3;
+  readonly attribute optional nullable char_string<128> defaultNTP = 4;
+  readonly attribute optional TimeZoneStruct timeZone[] = 5;
+  readonly attribute optional DSTOffsetStruct DSTOffset[] = 6;
+  readonly attribute optional nullable epoch_us localTime = 7;
+  readonly attribute optional TimeZoneDatabaseEnum timeZoneDatabase = 8;
+  readonly attribute optional boolean NTPServerAvailable = 9;
+  readonly attribute optional int8u timeZoneListMaxSize = 10;
+  readonly attribute optional int8u DSTOffsetListMaxSize = 11;
+  readonly attribute optional boolean supportsDNSResolve = 12;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetUTCTimeRequest {
+    epoch_us UTCTime = 0;
+    GranularityEnum granularity = 1;
+    optional TimeSourceEnum timeSource = 2;
+  }
+
+  request struct SetTrustedTimeSourceRequest {
+    nullable FabricScopedTrustedTimeSourceStruct trustedTimeSource = 0;
+  }
+
+  request struct SetTimeZoneRequest {
+    TimeZoneStruct timeZone[] = 0;
+  }
+
+  response struct SetTimeZoneResponse = 3 {
+    boolean DSTOffsetRequired = 0;
+  }
+
+  request struct SetDSTOffsetRequest {
+    DSTOffsetStruct DSTOffset[] = 0;
+  }
+
+  request struct SetDefaultNTPRequest {
+    nullable char_string<128> defaultNTP = 0;
+  }
+
+  /** This command is used to set the UTC time of the node. */
+  command access(invoke: administer) SetUTCTime(SetUTCTimeRequest): DefaultSuccess = 0;
+  /** This command is used to set the TrustedTimeSource attribute. */
+  fabric command access(invoke: administer) SetTrustedTimeSource(SetTrustedTimeSourceRequest): DefaultSuccess = 1;
+  /** This command is used to set the time zone of the node. */
+  command access(invoke: manage) SetTimeZone(SetTimeZoneRequest): SetTimeZoneResponse = 2;
+  /** This command is used to set the DST offsets for a node. */
+  command access(invoke: manage) SetDSTOffset(SetDSTOffsetRequest): DefaultSuccess = 4;
+  /** This command is used to set the DefaultNTP attribute. */
+  command access(invoke: administer) SetDefaultNTP(SetDefaultNTPRequest): DefaultSuccess = 5;
+}
+
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 cluster AdministratorCommissioning = 60 {
   revision 1;
@@ -2001,7 +2147,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2010,6 +2161,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2034,12 +2186,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2066,13 +2225,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2562,7 +2721,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2717,6 +2876,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2845,6 +3005,18 @@ endpoint 0 {
     handle command ResetCounts;
   }
 
+  server cluster TimeSynchronization {
+    callback attribute UTCTime;
+    callback attribute granularity;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision;
+
+    handle command SetUTCTime;
+  }
+
   server cluster AdministratorCommissioning {
     callback attribute windowStatus;
     callback attribute adminFabricIndex;
@@ -2889,6 +3061,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2960,6 +3133,8 @@ endpoint 1 {
     ram      attribute minSetpointDeadBand default = 0x19;
     ram      attribute controlSequenceOfOperation default = 0x04;
     persist  attribute systemMode default = 0x01;
+    ram      attribute temperatureSetpointHold default = 0;
+    ram      attribute temperatureSetpointHoldDuration;
     callback attribute presetTypes;
     callback attribute scheduleTypes;
     ram      attribute numberOfPresets default = 0;
@@ -2973,7 +3148,7 @@ endpoint 1 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0x1A3;
+    ram      attribute featureMap default = 0x5A3;
     callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index f8848604808..9907523c7f6 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1999,6 +1999,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3735,6 +3751,138 @@
             }
           ]
         },
+        {
+          "name": "Time Synchronization",
+          "code": 56,
+          "mfgCode": null,
+          "define": "TIME_SYNCHRONIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "SetUTCTime",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "UTCTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_us",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Granularity",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "GranularityEnum",
+              "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": "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Administrator Commissioning",
           "code": 60,
@@ -4321,6 +4469,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -5154,6 +5318,38 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "TemperatureSetpointHold",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TemperatureSetpointHoldEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TemperatureSetpointHoldDuration",
+              "code": 36,
+              "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": "PresetTypes",
               "code": 72,
@@ -5372,7 +5568,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x1A3",
+              "defaultValue": "0x5A3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -5539,4 +5735,4 @@
       "parentEndpointIdentifier": null
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/thread-br-app/thread-br-common/thread-br-app.matter b/examples/thread-br-app/thread-br-common/thread-br-app.matter
index a0f17c424cf..d9880b6926f 100644
--- a/examples/thread-br-app/thread-br-common/thread-br-app.matter
+++ b/examples/thread-br-app/thread-br-common/thread-br-app.matter
@@ -1115,7 +1115,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1566,7 +1565,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1575,6 +1579,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1599,12 +1604,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1631,13 +1643,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1702,7 +1714,7 @@ cluster ThreadBorderRouterManagement = 1106 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1818,6 +1830,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1864,6 +1877,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/thread-br-app/thread-br-common/thread-br-app.zap b/examples/thread-br-app/thread-br-common/thread-br-app.zap
index d1002280221..f1da345bb10 100644
--- a/examples/thread-br-app/thread-br-common/thread-br-app.zap
+++ b/examples/thread-br-app/thread-br-common/thread-br-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1548,6 +1548,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2089,6 +2105,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 581162c54d9..9c972524bf0 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1683,7 +1683,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2435,7 +2434,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2444,6 +2448,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2468,12 +2473,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2500,13 +2512,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3752,7 +3764,7 @@ cluster ContentAppObserver = 1296 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster Binding;
   binding cluster GeneralCommissioning;
@@ -3896,6 +3908,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -4059,6 +4072,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 9fac241c295..330d11c5659 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1850,6 +1850,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -4139,6 +4155,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/tv-casting-app/APIs.md b/examples/tv-casting-app/APIs.md
index a05ea0fcb76..1f198cfb7dd 100644
--- a/examples/tv-casting-app/APIs.md
+++ b/examples/tv-casting-app/APIs.md
@@ -1249,7 +1249,8 @@ std::string instanceName = GenerateRandomInstanceName(); // Implement your rando
 // Step 2: Set up IdentificationDeclarationOptions with NoPasscode and targetAppInfo
 matter::casting::core::IdentificationDeclarationOptions idOptions;
 idOptions.mNoPasscode = true;
-idOptions.mInstanceName = instanceName.c_str();
+strncpy(idOptions.mCommissioneeInstanceName, instanceName.c_str(), sizeof(idOptions.mCommissioneeInstanceName) - 1);
+idOptions.mCommissioneeInstanceName[sizeof(idOptions.mCommissioneeInstanceName) - 1] = '\0';
 
 chip::Protocols::UserDirectedCommissioning::TargetAppInfo targetAppInfo;
 targetAppInfo.vendorId = kDesiredAppVendorId;  // Your target app's vendor ID
@@ -1275,7 +1276,8 @@ connectionCallbacks.mCommissionerDeclarationCallback = [&instanceName, &targetCa
     // Step 4: Cancel the UDC session by sending CancelPasscode
     matter::casting::core::IdentificationDeclarationOptions cancelOptions;
     cancelOptions.mCancelPasscode = true;
-    cancelOptions.mInstanceName = instanceName.c_str();
+    strncpy(cancelOptions.mCommissioneeInstanceName, instanceName.c_str(), sizeof(cancelOptions.mCommissioneeInstanceName) - 1);
+    cancelOptions.mCommissioneeInstanceName[sizeof(cancelOptions.mCommissioneeInstanceName) - 1] = '\0';
 
     matter::casting::core::ConnectionCallbacks cancelCallbacks;
     // Send the cancel message using SendUDC
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp
index 0ee5d31784b..c9d5e9aedb7 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp
@@ -77,22 +77,27 @@ JNI_METHOD(jobject, sendUDC)
         ChipLogError(AppServer, "MatterCastingPlayer-JNI::sendUDC() jFailureCallback == nullptr but is mandatory "));
 
     // jIdentificationDeclarationOptions is optional
-    matter::casting::core::IdentificationDeclarationOptions * idOptions = nullptr;
-    if (jIdentificationDeclarationOptions == nullptr)
+    matter::casting::core::IdentificationDeclarationOptions idOptions;
+    if (jIdentificationDeclarationOptions != nullptr)
     {
-        ChipLogProgress(AppServer,
-                        "MatterCastingPlayer-JNI::sendUDC() Optional jIdentificationDeclarationOptions not "
-                        "provided by the client");
+        ChipLogProgress(AppServer, "MatterCastingPlayer-JNI::sendUDC() jIdentificationDeclarationOptions was provided by client");
+        std::unique_ptr<matter::casting::core::IdentificationDeclarationOptions> idOptionsCpp(
+            support::convertIdentificationDeclarationOptionsFromJavaToCpp(jIdentificationDeclarationOptions));
+        if (idOptionsCpp == nullptr)
+        {
+            ChipLogError(AppServer,
+                         "MatterCastingPlayer-JNI::sendUDC() "
+                         "convertIdentificationDeclarationOptionsFromJavaToCpp() error");
+            return support::convertMatterErrorFromCppToJava(CHIP_ERROR_INVALID_ARGUMENT);
+        }
+        idOptions = *idOptionsCpp;
+        idOptions.LogDetail();
     }
     else
     {
-        ChipLogProgress(AppServer, "MatterCastingPlayer-JNI::sendUDC() jIdentificationDeclarationOptions was provided by client");
-        idOptions = support::convertIdentificationDeclarationOptionsFromJavaToCpp(jIdentificationDeclarationOptions);
-        VerifyOrReturnValue(idOptions != nullptr, support::convertMatterErrorFromCppToJava(CHIP_ERROR_INVALID_ARGUMENT),
-                            ChipLogError(AppServer,
-                                         "MatterCastingPlayer-JNI::sendUDC() "
-                                         "convertIdentificationDeclarationOptionsFromJavaToCpp() error"));
-        idOptions->LogDetail();
+        ChipLogProgress(AppServer,
+                        "MatterCastingPlayer-JNI::sendUDC() Optional jIdentificationDeclarationOptions not "
+                        "provided by the client");
     }
 
     TEMPORARY_RETURN_IGNORED MatterCastingPlayerJNIMgr().mConnectionSuccessHandler.SetUp(env, jSuccessCallback);
@@ -116,7 +121,7 @@ JNI_METHOD(jobject, sendUDC)
     connectionCallbacks.mCommissionerDeclarationCallback =
         MatterCastingPlayerJNI::getInstance().getCommissionerDeclarationCallback();
 
-    castingPlayer->SendUDC(connectionCallbacks, *idOptions);
+    castingPlayer->SendUDC(connectionCallbacks, idOptions);
 
     return support::convertMatterErrorFromCppToJava(CHIP_NO_ERROR);
 }
@@ -159,24 +164,29 @@ JNI_METHOD(jobject, verifyOrEstablishConnection)
                      "MatterCastingPlayer-JNI::verifyOrEstablishConnection() jFailureCallback == nullptr but is mandatory "));
 
     // jIdentificationDeclarationOptions is optional
-    matter::casting::core::IdentificationDeclarationOptions * idOptions = nullptr;
-    if (jIdentificationDeclarationOptions == nullptr)
-    {
-        ChipLogProgress(AppServer,
-                        "MatterCastingPlayer-JNI::verifyOrEstablishConnection() Optional jIdentificationDeclarationOptions not "
-                        "provided by the client");
-    }
-    else
+    matter::casting::core::IdentificationDeclarationOptions idOptions;
+    if (jIdentificationDeclarationOptions != nullptr)
     {
         ChipLogProgress(
             AppServer,
             "MatterCastingPlayer-JNI::verifyOrEstablishConnection() jIdentificationDeclarationOptions was provided by client");
-        idOptions = support::convertIdentificationDeclarationOptionsFromJavaToCpp(jIdentificationDeclarationOptions);
-        VerifyOrReturnValue(idOptions != nullptr, support::convertMatterErrorFromCppToJava(CHIP_ERROR_INVALID_ARGUMENT),
-                            ChipLogError(AppServer,
-                                         "MatterCastingPlayer-JNI::verifyOrEstablishConnection() "
-                                         "convertIdentificationDeclarationOptionsFromJavaToCpp() error"));
-        idOptions->LogDetail();
+        std::unique_ptr<matter::casting::core::IdentificationDeclarationOptions> idOptionsCpp(
+            support::convertIdentificationDeclarationOptionsFromJavaToCpp(jIdentificationDeclarationOptions));
+        if (idOptionsCpp == nullptr)
+        {
+            ChipLogError(AppServer,
+                         "MatterCastingPlayer-JNI::verifyOrEstablishConnection() "
+                         "convertIdentificationDeclarationOptionsFromJavaToCpp() error");
+            return support::convertMatterErrorFromCppToJava(CHIP_ERROR_INVALID_ARGUMENT);
+        }
+        idOptions = *idOptionsCpp;
+        idOptions.LogDetail();
+    }
+    else
+    {
+        ChipLogProgress(AppServer,
+                        "MatterCastingPlayer-JNI::verifyOrEstablishConnection() Optional jIdentificationDeclarationOptions not "
+                        "provided by the client");
     }
 
     TEMPORARY_RETURN_IGNORED MatterCastingPlayerJNIMgr().mConnectionSuccessHandler.SetUp(env, jSuccessCallback);
@@ -201,7 +211,7 @@ JNI_METHOD(jobject, verifyOrEstablishConnection)
         MatterCastingPlayerJNI::getInstance().getCommissionerDeclarationCallback();
 
     castingPlayer->VerifyOrEstablishConnection(connectionCallbacks, static_cast<uint16_t>(commissioningWindowTimeoutSec),
-                                               *idOptions);
+                                               idOptions);
 
     return support::convertMatterErrorFromCppToJava(CHIP_NO_ERROR);
 }
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingApp.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingApp.mm
index 9a1cfc33589..7ae098b02a3 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingApp.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingApp.mm
@@ -46,6 +46,9 @@ @interface MCCastingApp ()
 // Client defiend data source used to initialize the MCCommissionableDataProvider and, if needed, update the MCCommissionableDataProvider post initialization. This is necessary for the Commissioner-Generated passcode commissioning feature.
 @property (nonatomic, strong) id<MCDataSource> dataSource;
 
+// Track whether this is the first start (cold boot) or subsequent start (warm boot)
+@property (atomic) BOOL hasStartedBefore;
+
 @end
 
 @implementation MCCastingApp
@@ -129,32 +132,61 @@ - (NSError *)updateCommissionableDataProvider
 
 - (void)startWithCompletionBlock:(void (^)(NSError *))completion
 {
-    ChipLogProgress(AppServer, "MCCastingApp.startWithCompletionBlock called");
+    ChipLogProgress(AppServer, "MCCastingApp.startWithCompletionBlock called (%s start)", self.hasStartedBefore ? "warm" : "cold");
+    self.hasStartedBefore = YES;
+
     VerifyOrReturn(_workQueue != nil && _clientQueue != nil, dispatch_async(self->_clientQueue, ^{
+        ChipLogError(AppServer, "MCCastingApp.startWithCompletionBlock failed: work queue or client queue is nil");
         completion([MCErrorUtils NSErrorFromChipError:CHIP_ERROR_INCORRECT_STATE]);
     }));
 
-    dispatch_async(_workQueue, ^{
-        __block CHIP_ERROR err = matter::casting::core::CastingApp::GetInstance()->Start();
+    // Start event loop task FIRST (synchronously) to ensure proper state
+    __block CHIP_ERROR err = chip::DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
+    if (err != CHIP_NO_ERROR) {
+        ChipLogError(AppServer, "MCCastingApp.startWithCompletionBlock StartEventLoopTask failed: %s", err.AsString());
         dispatch_async(self->_clientQueue, ^{
             completion([MCErrorUtils NSErrorFromChipError:err]);
         });
+        // Early return to prevent double completion call
+        return;
+    }
+
+    // Only then start the casting app (on work queue)
+    dispatch_async(_workQueue, ^{
+        CHIP_ERROR startErr = matter::casting::core::CastingApp::GetInstance()->Start();
+        if (startErr != CHIP_NO_ERROR) {
+            ChipLogError(AppServer, "MCCastingApp.startWithCompletionBlock CastingApp::Start failed: %s", startErr.AsString());
+        }
+
+        dispatch_async(self->_clientQueue, ^{
+            completion([MCErrorUtils NSErrorFromChipError:startErr]);
+        });
     });
-    __block CHIP_ERROR err = chip::DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
-    VerifyOrReturn(err == CHIP_NO_ERROR, dispatch_async(self->_clientQueue, ^{
-        completion([MCErrorUtils NSErrorFromChipError:err]);
-    }));
 }
 
 - (void)stopWithCompletionBlock:(void (^)(NSError *))completion
 {
     ChipLogProgress(AppServer, "MCCastingApp.stopWithCompletionBlock called");
     VerifyOrReturn(_workQueue != nil && _clientQueue != nil, dispatch_async(self->_clientQueue, ^{
+        ChipLogError(AppServer, "MCCastingApp.stopWithCompletionBlock failed: work queue or client queue is nil");
         completion([MCErrorUtils NSErrorFromChipError:CHIP_ERROR_INCORRECT_STATE]);
     }));
 
     dispatch_async(_workQueue, ^{
-        __block CHIP_ERROR err = matter::casting::core::CastingApp::GetInstance()->Stop();
+        // Stop the casting app first
+        CHIP_ERROR err = matter::casting::core::CastingApp::GetInstance()->Stop();
+        if (err != CHIP_NO_ERROR) {
+            ChipLogError(AppServer, "MCCastingApp.stopWithCompletionBlock CastingApp::Stop failed: %s", err.AsString());
+        }
+
+        // Then stop the event loop task to transition WorkQueue to suspended state
+        CHIP_ERROR stopEventLoopErr = chip::DeviceLayer::PlatformMgrImpl().StopEventLoopTask();
+        if (stopEventLoopErr != CHIP_NO_ERROR) {
+            ChipLogError(AppServer, "MCCastingApp.stopWithCompletionBlock StopEventLoopTask failed: %s", stopEventLoopErr.AsString());
+            if (err == CHIP_NO_ERROR) {
+                err = stopEventLoopErr;
+            }
+        }
 
         dispatch_async(self->_clientQueue, ^{
             completion([MCErrorUtils NSErrorFromChipError:err]);
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
index 618f3322757..8e4fbee15e7 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
@@ -24,11 +24,13 @@
 #include "support/ChipDeviceEventHandler.h"
 
 #include <DeviceInfoProviderImpl.h>
+#include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/bindings/BindingManager.h>
 #include <app/server/Server.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 namespace {
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
@@ -123,7 +125,13 @@ CHIP_ERROR CastingApp::Start()
     // Start Matter server
     chip::ServerInitParams * serverInitParams = mAppParameters->GetServerInitParamsProvider()->Get();
     VerifyOrReturnError(serverInitParams != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    ReturnErrorOnFailure(chip::Server::GetInstance().Init(*serverInitParams));
+
+    CHIP_ERROR initError = chip::Server::GetInstance().Init(*serverInitParams);
+    if (initError != CHIP_NO_ERROR)
+    {
+        ChipLogError(Discovery, "CastingApp::Start() Server::Init failed: %s", initError.AsString());
+        return initError;
+    }
 
     // Perform post server startup registrations
     ReturnErrorOnFailure(PostStartRegistrations());
@@ -142,6 +150,7 @@ CHIP_ERROR CastingApp::Start()
         CastingPlayer::GetTargetCastingPlayer()->VerifyOrEstablishConnection(connectionCallbacks);
     }
 
+    ChipLogProgress(Discovery, "CastingApp::Start() completed");
     return CHIP_NO_ERROR;
 }
 
@@ -188,10 +197,21 @@ CHIP_ERROR CastingApp::Stop()
     chip::Server::GetInstance().GetUserDirectedCommissioningClient()->SetCommissionerDeclarationHandler(nullptr);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
 
-    // Shutdown the Matter server
+    // Shutdown the Matter server to clean up active sessions
     chip::Server::GetInstance().Shutdown();
 
+    // Shutdown the CodegenDataModelProvider to reset mContext
+    CHIP_ERROR providerShutdownErr = chip::app::CodegenDataModelProvider::Instance().Shutdown();
+    if (providerShutdownErr != CHIP_NO_ERROR)
+    {
+        ChipLogError(Discovery, "CastingApp::Stop() CodegenDataModelProvider::Shutdown failed: %s", providerShutdownErr.AsString());
+    }
+
+    // Destroy EventManagement to reset its state
+    chip::app::EventManagement::DestroyEventManagement();
+
     mState = CASTING_APP_NOT_RUNNING; // CastingApp stopped successfully, set state to NOT_RUNNING
+    ChipLogProgress(Discovery, "CastingApp::Stop() completed");
 
     return CHIP_NO_ERROR;
 }
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
index f3247d76640..9f704930627 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
@@ -35,10 +35,8 @@ void CastingPlayer::SendUDC(ConnectionCallbacks connectionCallbacks, Identificat
 
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-    VerifyOrExit(
-        connectionCallbacks.mOnConnectionComplete != nullptr,
-        ChipLogError(AppServer,
-                     "CastingPlayer::VerifyOrEstablishConnection() ConnectionCallbacks.mOnConnectionComplete was not provided"));
+    VerifyOrExit(connectionCallbacks.mOnConnectionComplete != nullptr,
+                 ChipLogError(AppServer, "CastingPlayer::SendUDC() ConnectionCallbacks.mOnConnectionComplete was not provided"));
 
     mOnCompleted         = connectionCallbacks.mOnConnectionComplete;
     mTargetCastingPlayer = weak_from_this();
@@ -212,7 +210,14 @@ void CastingPlayer::VerifyOrEstablishConnection(ConnectionCallbacks connectionCa
                             ChipLogProgress(AppServer,
                                             "CastingPlayer::VerifyOrEstablishConnection() FindOrEstablishSession Connection to "
                                             "CastingPlayer successful");
-                            CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_CONNECTED;
+                            CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+                            VerifyOrReturn(
+                                targetCastingPlayer != nullptr,
+                                ChipLogError(AppServer,
+                                             "CastingPlayer::VerifyOrEstablishConnection() Target CastingPlayer no longer exists, "
+                                             "skipping connection handling"));
+
+                            targetCastingPlayer->mConnectionState = CASTING_PLAYER_CONNECTED;
 
                             // this async call will Load all the endpoints with their respective attributes into the
                             // TargetCastingPlayer.
@@ -225,16 +230,25 @@ void CastingPlayer::VerifyOrEstablishConnection(ConnectionCallbacks connectionCa
                             ChipLogError(AppServer,
                                          "CastingPlayer::VerifyOrEstablishConnection() FindOrEstablishSession Connection to "
                                          "CastingPlayer failed");
-                            CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
-                            CastingPlayer::GetTargetCastingPlayer()->RemoveFabric();
-                            CHIP_ERROR e = support::CastingStore::GetInstance()->Delete(*CastingPlayer::GetTargetCastingPlayer());
+                            CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+                            VerifyOrReturn(
+                                targetCastingPlayer != nullptr,
+                                ChipLogError(AppServer,
+                                             "CastingPlayer::VerifyOrEstablishConnection() Target CastingPlayer no longer exists, "
+                                             "skipping cleanup"));
+
+                            targetCastingPlayer->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+                            targetCastingPlayer->RemoveFabric();
+                            CHIP_ERROR e = support::CastingStore::GetInstance()->Delete(*targetCastingPlayer);
                             if (e != CHIP_NO_ERROR)
                             {
                                 ChipLogError(AppServer, "CastingStore::Delete() failed. Err: %" CHIP_ERROR_FORMAT, e.Format());
                             }
 
-                            VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
-                            CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(error, nullptr);
+                            if (targetCastingPlayer->mOnCompleted)
+                            {
+                                targetCastingPlayer->mOnCompleted(error, nullptr);
+                            }
                             mTargetCastingPlayer.reset();
                         });
                     return; // FindOrEstablishSession called. Return early.
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
index 11226b9f70c..a923c92e213 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
@@ -332,16 +332,19 @@ class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>, public
     void OnCommissioningWindowOpened() override;
     void OnCommissioningWindowClosed() override;
 
-private:
-    std::vector<memory::Strong<Endpoint>> mEndpoints;
-    ConnectionState mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
-    CastingPlayerAttributes mAttributes;
-    IdentificationDeclarationOptions mIdOptions;
+protected:
+    // Exposed for testing - allows test code to simulate the crash scenario
     // This is a std::weak_ptr. A std::weak_ptr is a non-owning reference to an object managed by one
     // or more std::shared_ptr instances. When the last std::shared_ptr instance that owns the managed
     // object is destroyed or reset, the object itself is automatically destroyed, and all
     // std::weak_ptr instances that reference that object become expired.
     static memory::Weak<CastingPlayer> mTargetCastingPlayer;
+
+private:
+    std::vector<memory::Strong<Endpoint>> mEndpoints;
+    ConnectionState mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+    CastingPlayerAttributes mAttributes;
+    IdentificationDeclarationOptions mIdOptions;
     uint16_t mCommissioningWindowTimeoutSec = kCommissioningWindowTimeoutSec;
     ConnectCallback mOnCompleted            = {};
     bool mClientProvidedCommissionerDeclarationCallback;
diff --git a/examples/tv-casting-app/tv-casting-common/core/tests/BUILD.gn b/examples/tv-casting-app/tv-casting-common/core/tests/BUILD.gn
index b165da01169..7509b569445 100644
--- a/examples/tv-casting-app/tv-casting-common/core/tests/BUILD.gn
+++ b/examples/tv-casting-app/tv-casting-common/core/tests/BUILD.gn
@@ -14,20 +14,29 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
+
 import("${chip_root}/build/chip/chip_test_suite.gni")
 
-# Unit tests for CastingPlayer fabric cleanup functionality
 chip_test_suite("tests") {
   output_name = "libTvCastingCommonTests"
 
-  test_sources = [ "TestCastingPlayerFabricCleanup.cpp" ]
+  test_sources = [
+    "TestCastingPlayerFabricCleanup.cpp",
+    "TestCastingPlayerNullPointerFix.cpp",
+  ]
+
+  cflags = [ "-Wconversion" ]
 
   public_deps = [
+    "$dir_pw_unit_test",
     "${chip_root}/examples/tv-casting-app/tv-casting-common",
+    "${chip_root}/src/app",
     "${chip_root}/src/app/server",
     "${chip_root}/src/credentials",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
+    "${chip_root}/src/platform",
   ]
 }
 
diff --git a/examples/tv-casting-app/tv-casting-common/core/tests/README.md b/examples/tv-casting-app/tv-casting-common/core/tests/README.md
index c8eba167453..db340e5ef42 100644
--- a/examples/tv-casting-app/tv-casting-common/core/tests/README.md
+++ b/examples/tv-casting-app/tv-casting-common/core/tests/README.md
@@ -23,7 +23,60 @@ ninja -C out/darwin-arm64-tests tests/TestCastingPlayerFabricCleanup
 ./out/darwin-arm64-tests/tests/TestCastingPlayerFabricCleanup
 ```
 
-### 2. SendUDC Tests (`CastingPlayerSendUDCTest.cpp`)
+### 2. Null Pointer Fix Tests (`TestCastingPlayerNullPointerFix.cpp`)
+
+Tests for the null pointer dereference fix in CastingPlayer connection
+callbacks.
+
+**Test Count:** 6 tests
+
+#### Background
+
+The CastingPlayer uses a weak_ptr (`mTargetCastingPlayer`) to track the
+currently targeted casting player. When connection attempts fail, callbacks are
+invoked that access this target. However, if multiple connection failures occur
+in quick succession, the first failure callback may delete the CastingPlayer
+(via `RemoveFabric()` and `Delete()`), causing subsequent callbacks to crash
+when they try to dereference the now-null pointer.
+
+#### Test Cases
+
+1. **TestGetTargetCastingPlayerReturnsNull** - Verifies that
+   `GetTargetCastingPlayer()` correctly returns nullptr when the weak_ptr has
+   expired
+2. **TestConnectionFailureCallbackWithNullTarget** - Simulates the crash
+   scenario where a failure callback executes after the target has been deleted
+3. **TestConnectionSuccessCallbackWithNullTarget** - Tests that success
+   callbacks also handle null targets gracefully
+4. **TestMultipleCallbacksWithNullTarget** - Simulates multiple queued callbacks
+   executing after target deletion
+5. **TestCallbackWithValidTarget** - Verifies that callbacks work correctly when
+   the target is valid
+6. **TestRaceConditionDocumentation** - Documents the theoretical race condition
+   and why it's not a concern in practice (CHIP uses a single-threaded event
+   loop model)
+
+#### The Fix
+
+The fix adds null pointer checks before dereferencing
+`GetTargetCastingPlayer()`:
+
+```cpp
+CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+if (targetCastingPlayer == nullptr)
+{
+    ChipLogError(AppServer, "Target CastingPlayer no longer exists, skipping cleanup");
+    return;
+}
+
+// Now safe to use targetCastingPlayer
+targetCastingPlayer->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+```
+
+This prevents the SIGSEGV crash that occurred when multiple connection failures
+tried to access a deleted CastingPlayer.
+
+### 3. SendUDC Tests (`CastingPlayerSendUDCTest.cpp`)
 
 Tests for the `SendUDC` functionality in the Matter TV Casting application.
 
@@ -115,7 +168,7 @@ The iOS tests use XCTest and OCMock to test:
 
 ## Running the Tests
 
-### C++ Tests (Fabric Cleanup)
+### C++ Tests (Fabric Cleanup & Null Pointer Fix)
 
 **Important:** Always activate the build environment first:
 
@@ -144,21 +197,25 @@ done
 ##### Linux
 
 ```bash
-# Build the test
+# Build the tests
 ninja -C out/linux-x64-tests tests/TestCastingPlayerFabricCleanup
+ninja -C out/linux-x64-tests tests/TestCastingPlayerNullPointerFix
 
-# Run the test
+# Run the tests
 ./out/linux-x64-tests/tests/TestCastingPlayerFabricCleanup
+./out/linux-x64-tests/tests/TestCastingPlayerNullPointerFix
 ```
 
 ##### macOS
 
 ```bash
-# Build the test
+# Build the tests
 ninja -C out/darwin-arm64-tests tests/TestCastingPlayerFabricCleanup
+ninja -C out/darwin-arm64-tests tests/TestCastingPlayerNullPointerFix
 
-# Run the test
+# Run the tests
 ./out/darwin-arm64-tests/tests/TestCastingPlayerFabricCleanup
+./out/darwin-arm64-tests/tests/TestCastingPlayerNullPointerFix
 ```
 
 #### Run ALL Example Tests
@@ -393,3 +450,7 @@ When adding new functionality to `SendUDC`, please:
     usage
 -   [Matter Specification](https://csa-iot.org/developer-resource/specifications-download-request/) -
     Section 5.3.7.4 on UDC with no Passcode prompt
+-   [FABRIC_CLEANUP_TESTS.md](FABRIC_CLEANUP_TESTS.md) - Detailed documentation
+    for fabric cleanup tests
+-   [CASE_SESSION_MANAGER_CRASH_FIX.md](/CASE_SESSION_MANAGER_CRASH_FIX.md) -
+    Documentation of the null pointer crash issue
diff --git a/examples/tv-casting-app/tv-casting-common/core/tests/TestCastingPlayerNullPointerFix.cpp b/examples/tv-casting-app/tv-casting-common/core/tests/TestCastingPlayerNullPointerFix.cpp
new file mode 100644
index 00000000000..efdeaa804e2
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/core/tests/TestCastingPlayerNullPointerFix.cpp
@@ -0,0 +1,289 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ *    @file
+ *      This file implements unit tests for the CastingPlayer null pointer
+ *      dereference fix. These tests verify that connection callbacks properly
+ *      handle the case where the target CastingPlayer has been deleted before
+ *      the callback executes.
+ *
+ */
+
+#include <pw_unit_test/framework.h>
+
+#include <app/server/Server.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMem.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include "../../support/CastingStore.h"
+#include "../CastingPlayer.h"
+
+using namespace chip;
+using namespace matter::casting::core;
+using namespace matter::casting::support;
+
+namespace matter {
+namespace casting {
+namespace core {
+namespace tests {
+
+// Test helper class that provides access to protected members for testing
+class CastingPlayerTestHelper : public CastingPlayer
+{
+public:
+    CastingPlayerTestHelper() : CastingPlayer(CastingPlayerAttributes()) {}
+
+    // Static helper methods to access protected members for testing
+    static void ResetTargetCastingPlayer() { CastingPlayer::mTargetCastingPlayer.reset(); }
+
+    static void SetTargetCastingPlayer(std::shared_ptr<CastingPlayer> player) { CastingPlayer::mTargetCastingPlayer = player; }
+};
+
+class TestCastingPlayerNullPointer : public ::testing::Test
+{
+public:
+    static void SetUpTestSuite()
+    {
+        ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR);
+        ASSERT_EQ(DeviceLayer::PlatformMgr().InitChipStack(), CHIP_NO_ERROR);
+    }
+
+    static void TearDownTestSuite()
+    {
+        DeviceLayer::PlatformMgr().Shutdown();
+        chip::Platform::MemoryShutdown();
+    }
+
+    void SetUp() override
+    {
+        mCallbackExecuted = false;
+        mCallbackError    = CHIP_NO_ERROR;
+    }
+
+    void TearDown() override
+    {
+        // Reset the target casting player
+        CastingPlayerTestHelper::ResetTargetCastingPlayer();
+    }
+
+protected:
+    static bool mCallbackExecuted;
+    static CHIP_ERROR mCallbackError;
+};
+
+bool TestCastingPlayerNullPointer::mCallbackExecuted    = false;
+CHIP_ERROR TestCastingPlayerNullPointer::mCallbackError = CHIP_NO_ERROR;
+
+// =================================
+//      Unit tests
+// =================================
+
+/**
+ * Test that GetTargetCastingPlayer returns nullptr when the weak_ptr has expired
+ */
+TEST_F(TestCastingPlayerNullPointer, TestGetTargetCastingPlayerReturnsNull)
+{
+    // Create a CastingPlayer and set it as target
+    CastingPlayerAttributes attrs;
+    auto castingPlayer = std::make_shared<CastingPlayer>(attrs);
+    CastingPlayerTestHelper::SetTargetCastingPlayer(castingPlayer);
+
+    // Verify we can get the target
+    EXPECT_NE(CastingPlayer::GetTargetCastingPlayer(), nullptr);
+
+    // Reset the shared pointer to simulate deletion
+    castingPlayer.reset();
+
+    // Verify GetTargetCastingPlayer returns nullptr
+    EXPECT_EQ(CastingPlayer::GetTargetCastingPlayer(), nullptr);
+}
+
+/**
+ * Test that connection failure callback handles null target gracefully
+ * This simulates the crash scenario from the bug report
+ */
+TEST_F(TestCastingPlayerNullPointer, TestConnectionFailureCallbackWithNullTarget)
+{
+    bool callbackInvoked     = false;
+    CHIP_ERROR capturedError = CHIP_NO_ERROR;
+
+    // Create a lambda that simulates the fixed failure callback
+    auto failureCallback = [&callbackInvoked, &capturedError](const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
+        callbackInvoked = true;
+        capturedError   = error;
+
+        // This is the critical fix: check for null before dereferencing
+        CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+        if (targetCastingPlayer == nullptr)
+        {
+            // Should handle gracefully without crashing
+            return;
+        }
+
+        // If we got here, the target exists - in real code this would call methods
+        // We can't test the actual state change without friend access, but we verify no crash
+    };
+
+    // Create a CastingPlayer and set it as target
+    CastingPlayerAttributes attrs;
+    auto castingPlayer = std::make_shared<CastingPlayer>(attrs);
+    CastingPlayerTestHelper::SetTargetCastingPlayer(castingPlayer);
+
+    // Simulate the first failure that deletes the CastingPlayer
+    castingPlayer.reset();
+    CastingPlayerTestHelper::ResetTargetCastingPlayer();
+
+    // Now invoke the callback (simulating a second queued failure)
+    chip::ScopedNodeId peerId(0x123, 1);
+    failureCallback(peerId, CHIP_ERROR_TIMEOUT);
+
+    // Verify the callback was invoked and handled the null gracefully
+    EXPECT_TRUE(callbackInvoked);
+    EXPECT_EQ(capturedError, CHIP_ERROR_TIMEOUT);
+}
+
+/**
+ * Test that connection success callback handles null target gracefully
+ */
+TEST_F(TestCastingPlayerNullPointer, TestConnectionSuccessCallbackWithNullTarget)
+{
+    bool callbackInvoked = false;
+
+    // Create a lambda that simulates the fixed success callback
+    auto successCallback = [&callbackInvoked]() {
+        callbackInvoked = true;
+
+        // This is the critical fix: check for null before dereferencing
+        CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+        if (targetCastingPlayer == nullptr)
+        {
+            // Should handle gracefully without crashing
+            return;
+        }
+
+        // If we got here, the target exists - in real code this would call methods
+    };
+
+    // Simulate the CastingPlayer being deleted before callback
+    CastingPlayerTestHelper::ResetTargetCastingPlayer();
+
+    // Invoke the callback
+    successCallback();
+
+    // Verify the callback was invoked and handled the null gracefully
+    EXPECT_TRUE(callbackInvoked);
+}
+
+/**
+ * Test multiple sequential callback invocations with null target
+ * This simulates the scenario where multiple connection attempts fail
+ */
+TEST_F(TestCastingPlayerNullPointer, TestMultipleCallbacksWithNullTarget)
+{
+    int callbackCount = 0;
+
+    auto failureCallback = [&callbackCount](CHIP_ERROR error) {
+        callbackCount++;
+
+        CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+        if (targetCastingPlayer == nullptr)
+        {
+            return;
+        }
+
+        // Would access target here in real code
+    };
+
+    // Ensure target is null
+    CastingPlayerTestHelper::ResetTargetCastingPlayer();
+
+    // Invoke callback multiple times (simulating multiple queued failures)
+    failureCallback(CHIP_ERROR_TIMEOUT);
+    failureCallback(CHIP_ERROR_TIMEOUT);
+    failureCallback(CHIP_ERROR_TIMEOUT);
+
+    // All callbacks should have executed without crashing
+    EXPECT_EQ(callbackCount, 3);
+}
+
+/**
+ * Test that valid target is accessed correctly in callback
+ */
+TEST_F(TestCastingPlayerNullPointer, TestCallbackWithValidTarget)
+{
+    bool callbackInvoked = false;
+    bool targetWasValid  = false;
+
+    auto failureCallback = [&callbackInvoked, &targetWasValid]() {
+        callbackInvoked = true;
+
+        CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+        if (targetCastingPlayer == nullptr)
+        {
+            return;
+        }
+
+        // Target is valid
+        targetWasValid = true;
+    };
+
+    // Create a valid CastingPlayer and set it as target
+    CastingPlayerAttributes attrs;
+    auto castingPlayer = std::make_shared<CastingPlayer>(attrs);
+    CastingPlayerTestHelper::SetTargetCastingPlayer(castingPlayer);
+
+    // Invoke the callback
+    failureCallback();
+
+    // Verify the callback executed and found a valid target
+    EXPECT_TRUE(callbackInvoked);
+    EXPECT_TRUE(targetWasValid);
+}
+
+/**
+ * Test the race condition scenario: target deleted between null check and usage
+ * This is a theoretical test to document the expected behavior
+ */
+TEST_F(TestCastingPlayerNullPointer, TestRaceConditionDocumentation)
+{
+    // This test documents that while we check for null, there's still a theoretical
+    // race condition where the target could be deleted between the null check and usage.
+    // However, in practice, this is prevented by the single-threaded event loop model
+    // used by the CHIP stack.
+
+    CastingPlayerAttributes attrs;
+    auto castingPlayer = std::make_shared<CastingPlayer>(attrs);
+    CastingPlayerTestHelper::SetTargetCastingPlayer(castingPlayer);
+
+    CastingPlayer * rawPtr = CastingPlayer::GetTargetCastingPlayer();
+    EXPECT_NE(rawPtr, nullptr);
+
+    // In a multi-threaded scenario, the target could be deleted here
+    // But CHIP's event loop model prevents this
+
+    // The pointer is still valid because we're single-threaded
+    // We can verify it's not null but can't access private members without friend access
+    EXPECT_NE(rawPtr, nullptr);
+}
+
+} // namespace tests
+} // namespace core
+} // namespace casting
+} // namespace matter
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 e93fd929e49..3e2967369c2 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -111,8 +111,8 @@ CHIP_ERROR CastingServer::SetRotatingDeviceIdUniqueId(chip::Optional<chip::ByteS
 CHIP_ERROR CastingServer::InitBindingHandlers()
 {
     auto & server = chip::Server::GetInstance();
-    TEMPORARY_RETURN_IGNORED app::Clusters::Binding::Manager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    LogErrorOnFailure(app::Clusters::Binding::Manager::GetInstance().Init(
+        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() }));
     return CHIP_NO_ERROR;
 }
 
diff --git a/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
index 16624c4fef8..0d75a058801 100644
--- a/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
+++ b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
@@ -83,7 +83,14 @@ void ChipDeviceEventHandler::Handle(const chip::DeviceLayer::ChipDeviceEvent * e
             nullptr,
             [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
                 ChipLogProgress(AppServer, "ChipDeviceEventHandler::Handle() Connection to CastingPlayer successful");
-                CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_CONNECTED;
+                CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+                VerifyOrReturn(
+                    targetCastingPlayer != nullptr,
+                    ChipLogError(AppServer,
+                                 "ChipDeviceEventHandler::Handle() Target CastingPlayer no longer exists, skipping connection "
+                                 "handling"));
+
+                targetCastingPlayer->mConnectionState = CASTING_PLAYER_CONNECTED;
 
                 // this async call will Load all the endpoints with their respective attributes into the TargetCastingPlayer
                 // persist the TargetCastingPlayer information into the CastingStore and call mOnCompleted()
@@ -93,15 +100,23 @@ void ChipDeviceEventHandler::Handle(const chip::DeviceLayer::ChipDeviceEvent * e
             },
             [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
                 ChipLogError(AppServer, "ChipDeviceEventHandler::Handle(): Connection to CastingPlayer failed");
-                CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
-                CHIP_ERROR err = support::CastingStore::GetInstance()->Delete(*CastingPlayer::GetTargetCastingPlayer());
+                CastingPlayer * targetCastingPlayer = CastingPlayer::GetTargetCastingPlayer();
+                VerifyOrReturn(
+                    targetCastingPlayer != nullptr,
+                    ChipLogError(AppServer,
+                                 "ChipDeviceEventHandler::Handle() Target CastingPlayer no longer exists, skipping cleanup"));
+
+                targetCastingPlayer->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+                CHIP_ERROR err                        = support::CastingStore::GetInstance()->Delete(*targetCastingPlayer);
                 if (err != CHIP_NO_ERROR)
                 {
                     ChipLogError(AppServer, "CastingStore::Delete() failed. Err: %" CHIP_ERROR_FORMAT, err.Format());
                 }
 
-                VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
-                CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(error, nullptr);
+                if (targetCastingPlayer->mOnCompleted)
+                {
+                    targetCastingPlayer->mOnCompleted(error, nullptr);
+                }
                 CastingPlayer::mTargetCastingPlayer.reset();
             });
     }
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index b85d14acda5..b0f65b645a4 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -993,65 +993,6 @@ cluster BasicInformation = 40 {
   command MfgSpecificPing(): DefaultSuccess = 0;
 }
 
-/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing common languages, units of measurements, and numerical formatting
-      standards. As such, Nodes that visually or audibly convey information need a mechanism by which
-      they can be configured to use a user’s preferred language, units, etc */
-cluster LocalizationConfiguration = 43 {
-  revision 1;
-
-  attribute access(write: manage) char_string<35> activeLocale = 0;
-  readonly attribute char_string supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
-      may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
-      or audibly convey time information need a mechanism by which they can be configured to use a
-      user’s preferred format. */
-cluster TimeFormatLocalization = 44 {
-  revision 1;
-
-  enum CalendarTypeEnum : enum8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-    kUseActiveLocale = 255;
-  }
-
-  enum HourFormatEnum : enum8 {
-    k12hr = 0;
-    k24hr = 1;
-    kUseActiveLocale = 255;
-  }
-
-  bitmap Feature : bitmap32 {
-    kCalendarFormat = 0x1;
-  }
-
-  attribute access(write: manage) HourFormatEnum hourFormat = 0;
-  attribute access(write: manage) optional CalendarTypeEnum activeCalendarType = 1;
-  readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 /** Nodes should be expected to be deployed to any and all regions of the world. These global regions
       may have differing preferences for the units in which values are conveyed in communication to a
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
@@ -1413,7 +1354,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1850,7 +1790,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1859,6 +1804,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1883,12 +1829,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1915,13 +1868,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3135,7 +3088,7 @@ cluster ContentAppObserver = 1296 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -3196,21 +3149,6 @@ endpoint 0 {
     callback attribute clusterRevision;
   }
 
-  server cluster LocalizationConfiguration {
-    ram      attribute activeLocale default = "en-US";
-    callback attribute supportedLocales;
-    callback attribute featureMap default = 0;
-    callback attribute clusterRevision;
-  }
-
-  server cluster TimeFormatLocalization {
-    persist  attribute hourFormat default = 0;
-    persist  attribute activeCalendarType default = 0;
-    callback attribute supportedCalendarTypes;
-    ram      attribute featureMap default = 0;
-    callback attribute clusterRevision;
-  }
-
   server cluster UnitLocalization {
     callback attribute temperatureUnit;
     ram      attribute featureMap default = 0x1;
@@ -3259,6 +3197,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3351,6 +3290,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index f4bd045f1f5..548a0d6db2a 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -804,7 +804,7 @@
           "mfgCode": null,
           "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "attributes": [
             {
               "name": "ActiveLocale",
@@ -878,7 +878,7 @@
           "mfgCode": null,
           "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "attributes": [
             {
               "name": "HourFormat",
@@ -1566,6 +1566,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2666,6 +2682,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
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 4d22af20071..850d862d55c 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
@@ -1643,7 +1643,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2247,7 +2246,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2256,6 +2260,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2280,12 +2285,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2312,13 +2324,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3624,7 +3636,7 @@ cluster ColorControl = 768 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -3765,6 +3777,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3928,6 +3941,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -3944,7 +3958,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type ma_onofflight = 256, version 1;
+  device type ma_onofflight = 256, version 4;
 
 
   server cluster Identify {
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 8638c862368..8b23a589741 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
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1718,6 +1718,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3909,6 +3925,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -4023,7 +4055,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        4
       ],
       "deviceIdentifiers": [
         256
diff --git a/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp b/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
index a3ab45b848a..e58b5c1643d 100644
--- a/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
+++ b/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
@@ -23,9 +23,9 @@
 
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <WaterHeaterInstance.h>
 #include <WaterHeaterMain.h>
 #include <WaterHeaterManufacturer.h>
@@ -51,6 +51,22 @@ using namespace chip::app::Clusters::WaterHeaterManagement;
 
 namespace {
 
+const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type kMeasurementAccuracyRanges[] = {
+    { .rangeMin   = 0,
+      .rangeMax   = 1'000'000'000'000'000, // 1 million Mwh
+      .percentMax = MakeOptional(static_cast<chip::Percent100ths>(500)),
+      .percentMin = MakeOptional(static_cast<chip::Percent100ths>(50)) }
+};
+
+const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyStruct::Type kMeasurementAccuracy = {
+    .measurementType  = MeasurementTypeEnum::kElectricalEnergy,
+    .measured         = true,
+    .minMeasuredValue = 0,
+    .maxMeasuredValue = 1'000'000'000'000'000, // 1 million Mwh
+    .accuracyRanges   = DataModel::List<const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type>(
+        kMeasurementAccuracyRanges)
+};
+
 // Common cluster instances
 std::unique_ptr<DeviceEnergyManagementDelegate> gDEMDelegate;
 std::unique_ptr<DeviceEnergyManagementManager> gDEMInstance;
@@ -250,22 +266,6 @@ void emberAfElectricalEnergyMeasurementClusterInitCallback(chip::EndpointId endp
         BitMask<ElectricalEnergyMeasurement::OptionalAttributes, uint32_t>(
             ElectricalEnergyMeasurement::OptionalAttributes::kOptionalAttributeCumulativeEnergyReset));
 
-    ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type energyAccuracyRanges[] = {
-        { .rangeMin   = 0,
-          .rangeMax   = 1'000'000'000'000'000, // 1 million Mwh
-          .percentMax = MakeOptional(static_cast<chip::Percent100ths>(500)),
-          .percentMin = MakeOptional(static_cast<chip::Percent100ths>(50)) }
-    };
-
-    ElectricalEnergyMeasurement::Structs::MeasurementAccuracyStruct::Type accuracy = {
-        .measurementType  = MeasurementTypeEnum::kElectricalEnergy,
-        .measured         = true,
-        .minMeasuredValue = 0,
-        .maxMeasuredValue = 1'000'000'000'000'000, // 1 million Mwh
-        .accuracyRanges =
-            DataModel::List<const ElectricalEnergyMeasurement::Structs::MeasurementAccuracyRangeStruct::Type>(energyAccuracyRanges)
-    };
-
     ElectricalEnergyMeasurement::Structs::CumulativeEnergyResetStruct::Type resetStruct = {
         .importedResetTimestamp = MakeOptional(MakeNullable(static_cast<uint32_t>(0))),
         .exportedResetTimestamp = MakeOptional(MakeNullable(static_cast<uint32_t>(0))),
@@ -276,7 +276,7 @@ void emberAfElectricalEnergyMeasurementClusterInitCallback(chip::EndpointId endp
     if (gEEMAttrAccess)
     {
         TEMPORARY_RETURN_IGNORED gEEMAttrAccess->Init();
-        TEMPORARY_RETURN_IGNORED SetMeasurementAccuracy(endpointId, accuracy);
+        TEMPORARY_RETURN_IGNORED SetMeasurementAccuracy(endpointId, kMeasurementAccuracy);
         TEMPORARY_RETURN_IGNORED SetCumulativeReset(endpointId, MakeOptional(resetStruct));
     }
 }
diff --git a/examples/water-heater-app/water-heater-common/water-heater-app.matter b/examples/water-heater-app/water-heater-common/water-heater-app.matter
index d977f5eb39e..682dbf60dae 100644
--- a/examples/water-heater-app/water-heater-common/water-heater-app.matter
+++ b/examples/water-heater-app/water-heater-common/water-heater-app.matter
@@ -1277,7 +1277,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1561,7 +1560,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1570,6 +1574,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1594,12 +1599,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1626,13 +1638,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2692,7 +2704,7 @@ cluster Thermostat = 513 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 1;
+  device type ma_rootdevice = 22, version 5;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2819,6 +2831,7 @@ endpoint 0 {
     callback attribute rebootCount;
     callback attribute upTime;
     ram      attribute testEventTriggersEnabled;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2873,6 +2886,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/water-heater-app/water-heater-common/water-heater-app.zap b/examples/water-heater-app/water-heater-common/water-heater-app.zap
index dfb2f070b0c..13d444ae4d4 100644
--- a/examples/water-heater-app/water-heater-common/water-heater-app.zap
+++ b/examples/water-heater-app/water-heater-common/water-heater-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1734,6 +1734,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2402,6 +2418,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -2460,7 +2492,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.matter b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.matter
index 7d700c95ed0..2d168b73b4b 100644
--- a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.matter
+++ b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.matter
@@ -1316,7 +1316,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -1600,7 +1599,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -1609,6 +1613,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -1633,12 +1638,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1665,13 +1677,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -1754,7 +1766,7 @@ cluster BooleanStateConfiguration = 128 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 3;
+  device type ma_rootdevice = 22, version 5;
 
 
   server cluster Descriptor {
@@ -1854,6 +1866,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
@@ -1899,6 +1912,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute featureMap;
     callback attribute clusterRevision;
 
diff --git a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
index fc7bda6c983..6414f3e4856 100644
--- a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
+++ b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        3
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1291,6 +1291,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1824,6 +1840,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 383a665133a..51e069b1a60 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -1498,7 +1498,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2102,7 +2101,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2111,6 +2115,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2135,12 +2140,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -2167,13 +2179,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -2444,7 +2456,7 @@ cluster WindowCovering = 258 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 4;
+  device type ma_rootdevice = 22, version 5;
   device type ma_powersource = 17, version 1;
   device type ma_otarequestor = 18, version 1;
 
@@ -2591,6 +2603,7 @@ endpoint 0 {
     callback attribute totalOperationalHours;
     callback attribute bootReason;
     callback attribute testEventTriggersEnabled default = false;
+    callback attribute deviceLoadStatus;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2763,6 +2776,7 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
+    callback attribute groupcastAdoption;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 5ad4b9b5286..17dcdbf5dab 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -69,7 +69,7 @@
       ],
       "deviceVersions": [
         1,
-        4,
+        5,
         1
       ],
       "deviceIdentifiers": [
@@ -1992,6 +1992,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -4314,6 +4330,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index 290c93901c3..2239f8437ec 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-185 : [Telink] Update Docker image (Zephyr update)
+186 : [Ameba] Update Docker image for C++ macro conflict resolution
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
index 95a42cfeccb..f7e48fc301e 100644
--- a/integrations/docker/images/chip-cert-bins/Dockerfile
+++ b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -64,6 +64,7 @@ RUN set -x \
     libdbus-1-dev \
     libdbus-glib-1-dev \
     libdmalloc-dev \
+    libevent-dev \
     libgif-dev \
     libgirepository1.0-dev \
     libglib2.0-dev \
@@ -174,7 +175,7 @@ RUN case ${TARGETPLATFORM} in \
     --target linux-x64-simulated-app1-ipv6only \
     --target linux-x64-lit-icd-ipv6only \
     --target linux-x64-energy-gateway-ipv6only \
-    --target linux-x64-energy-management-ipv6only \
+    --target linux-x64-evse-ipv6only \
     --target linux-x64-microwave-oven-ipv6only \
     --target linux-x64-rvc-ipv6only \
     --target linux-x64-fabric-bridge-rpc-ipv6only \
@@ -207,7 +208,7 @@ RUN case ${TARGETPLATFORM} in \
     && mv out/linux-x64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \
     && mv out/linux-x64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
     && mv out/linux-x64-energy-gateway-ipv6only/chip-energy-gateway-app out/chip-energy-gateway-app \
-    && mv out/linux-x64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
+    && mv out/linux-x64-evse-ipv6only/chip-evse-app out/chip-evse-app \
     && mv out/linux-x64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
     && mv out/linux-x64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
     && mv out/linux-x64-fabric-bridge-rpc-ipv6only/fabric-bridge-app out/fabric-bridge-app \
@@ -244,7 +245,7 @@ RUN case ${TARGETPLATFORM} in \
     --target linux-arm64-simulated-app1-ipv6only \
     --target linux-arm64-lit-icd-ipv6only \
     --target linux-arm64-energy-gateway-ipv6only \
-    --target linux-arm64-energy-management-ipv6only \
+    --target linux-arm64-evse-ipv6only \
     --target linux-arm64-microwave-oven-ipv6only \
     --target linux-arm64-rvc-ipv6only \
     --target linux-arm64-fabric-bridge-rpc-ipv6only \
@@ -277,7 +278,7 @@ RUN case ${TARGETPLATFORM} in \
     && mv out/linux-arm64-simulated-app1-ipv6only/chip-app1 out/chip-app1 \
     && mv out/linux-arm64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
     && mv out/linux-arm64-energy-gateway-ipv6only/chip-energy-gateway-app out/chip-energy-gateway-app \
-    && mv out/linux-arm64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
+    && mv out/linux-arm64-evse-ipv6only/chip-evse-app out/chip-evse-app \
     && mv out/linux-arm64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
     && mv out/linux-arm64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
     && mv out/linux-arm64-fabric-bridge-rpc-ipv6only/fabric-bridge-app out/fabric-bridge-app \
@@ -332,6 +333,7 @@ RUN apt-get install -y           \
   libcairo2-dev                  \
   libcurl4                       \
   libdbus-1-dev                  \
+  libevent-dev                   \
   libgirepository1.0-dev         \
   libglib2.0-dev                 \
   libgstreamer1.0-0              \
@@ -365,7 +367,7 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-lock-app apps/ch
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-app1 apps/chip-app1
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/lit-icd-app apps/lit-icd-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-gateway-app apps/chip-energy-gateway-app
-COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-management-app apps/chip-energy-management-app
+COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-evse-app apps/chip-evse-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-microwave-oven-app apps/chip-microwave-oven-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-rvc-app apps/chip-rvc-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/examples/fabric-admin/scripts/fabric-sync-app.py apps/fabric-sync-app
@@ -396,6 +398,9 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/data_model python_testing
 COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requirements.txt /tmp/requirements.txt
 RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt
 
+COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requirements.nfc.txt /tmp/requirements.nfc.txt
+RUN pip install --break-system-packages -r /tmp/requirements.nfc.txt && rm /tmp/requirements.nfc.txt
+
 # Stage 3.2: Setup the Mock Server
 COPY --from=chip-build-cert-bins /root/connectedhomeip/integrations/mock_server mock_server
 
diff --git a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile
index 88347cee754..361cb8aacc9 100644
--- a/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-ameba/Dockerfile
@@ -11,7 +11,7 @@ RUN set -x \
 
 # Setup Ameba
 ARG AMEBA_DIR=/opt/ameba
-ARG TAG_NAME=ameba_update_2025_10_07
+ARG TAG_NAME=ameba_update_2026_02_21
 RUN set -x \
     && apt-get update \
     && mkdir ${AMEBA_DIR} \
diff --git a/integrations/docker/images/stage-2/chip-cirque-device-base/Dockerfile b/integrations/docker/images/stage-2/chip-cirque-device-base/Dockerfile
index 5bb08505172..65196e3b06c 100644
--- a/integrations/docker/images/stage-2/chip-cirque-device-base/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-cirque-device-base/Dockerfile
@@ -28,6 +28,7 @@ RUN apt-get update \
   libavahi-client3 \
   libcairo2-dev \
   libdbus-1-dev \
+  libevent-dev \
   libgif-dev \
   libgirepository1.0-dev \
   libglib2.0-dev \
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index c98d74d68ce..8d3c330bd39 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -30,7 +30,7 @@
 from builders.qpg import QpgApp, QpgBoard, QpgBuilder
 from builders.realtek import RealtekApp, RealtekBoard, RealtekBuilder
 from builders.stm32 import stm32App, stm32Board, stm32Builder
-from builders.telink import TelinkApp, TelinkBoard, TelinkBuilder
+from builders.telink import TelinkApp, TelinkBoard, TelinkBuilder, TelinkLogLevel
 from builders.ti import TIApp, TIBoard, TIBuilder
 from builders.tizen import TizenApp, TizenBoard, TizenBuilder
 
@@ -547,7 +547,7 @@ def BuildNxpTarget():
     target.AppendModifier(name="ota", enable_ota=True).ExceptIfRe('zephyr')
     target.AppendModifier(name="wifi", enable_wifi=True).OnlyIfRe('rt1060|rt1170|rw61x')
     target.AppendModifier(name="ethernet", enable_ethernet=True).OnlyIfRe('rw61x')
-    target.AppendModifier(name="thread", enable_thread=True).ExceptIfRe('zephyr')
+    target.AppendModifier(name="thread", enable_thread=True)
     target.AppendModifier(name="matter-shell", enable_shell=True)
     target.AppendModifier(name="factory-build", enable_factory_data_build=True).OnlyIfRe('rt1060|rt1170|rw61x')
     target.AppendModifier(name="frdm", board_variant=NxpBoardVariant.FRDM).OnlyIfRe('rw61x|mcxw71|mcxw72')
@@ -709,10 +709,6 @@ def BuildBouffalolabTarget():
                    board=BouffalolabBoard.BL602_NIGHT_LIGHT, module_type="BL602", enable_resetCnt=True),
         TargetPart('BL706-NIGHT-LIGHT',
                    board=BouffalolabBoard.BL706_NIGHT_LIGHT, module_type="BL706C-22", enable_resetCnt=True),
-        TargetPart('BL602-IoT-Matter-V1',
-                   board=BouffalolabBoard.BL602_IoT_Matter_V1, module_type="BL602"),
-        TargetPart('XT-ZB6-DevKit', board=BouffalolabBoard.XT_ZB6_DevKit,
-                   module_type="BL706C-22"),
     ])
 
     target.AppendFixedTargets([
@@ -721,11 +717,11 @@ def BuildBouffalolabTarget():
     ])
 
     target.AppendFixedTargets([
-        TargetPart('ethernet', enable_ethernet=True),
-        TargetPart('wifi', enable_wifi=True),
-        TargetPart('thread', enable_thread_type=BouffalolabThreadType.THREAD_FTD),
-        TargetPart('thread-ftd', enable_thread_type=BouffalolabThreadType.THREAD_FTD),
-        TargetPart('thread-mtd', enable_thread_type=BouffalolabThreadType.THREAD_MTD),
+        TargetPart('ethernet', enable_ethernet=True).OnlyIfRe('-(bl616dk|bl706dk)'),
+        TargetPart('wifi', enable_wifi=True).OnlyIfRe('-(bl602dk|bl706dk|bl616dk)'),
+        TargetPart('thread', enable_thread_type=BouffalolabThreadType.THREAD_FTD).OnlyIfRe('-(bl616dk|bl704l|bl706dk)'),
+        TargetPart('thread-ftd', enable_thread_type=BouffalolabThreadType.THREAD_FTD).OnlyIfRe('-(bl616dk|bl704l|bl706dk)'),
+        TargetPart('thread-mtd', enable_thread_type=BouffalolabThreadType.THREAD_MTD).OnlyIfRe('-(bl616dk|bl704l|bl706dk)'),
     ])
 
     target.AppendFixedTargets([
@@ -821,6 +817,10 @@ def BuildTelinkTarget():
     target.AppendModifier('precompiled-ot', precompiled_ot_config=True)
     target.AppendModifier('tflm', tflm_config=True)
     target.AppendModifier('nfc-payload', chip_enable_nfc_onboarding_payload=True)
+    target.AppendModifier("log-progress", log_level=TelinkLogLevel.PROGRESS).ExceptIfRe("-log-(all|error|none)")
+    target.AppendModifier("log-error", log_level=TelinkLogLevel.ERROR).ExceptIfRe("-log-(progress|all|none)")
+    target.AppendModifier("log-none", log_level=TelinkLogLevel.NONE).ExceptIfRe("-log-(progress|error|all)")
+    target.AppendModifier("log-all", log_level=TelinkLogLevel.ALL).ExceptIfRe("-log-(progress|error|none)")
 
     return target
 
diff --git a/scripts/build/builders/bouffalolab.py b/scripts/build/builders/bouffalolab.py
index d5a1f76f03f..66172175853 100644
--- a/scripts/build/builders/bouffalolab.py
+++ b/scripts/build/builders/bouffalolab.py
@@ -14,6 +14,7 @@
 
 import logging
 import os
+import re
 import time
 from enum import Enum, auto
 
@@ -45,9 +46,7 @@ class BouffalolabBoard(Enum):
     BL616DK = auto()
     BL704LDK = auto()
     BL706DK = auto()
-    BL602_IoT_Matter_V1 = auto()
     BL602_NIGHT_LIGHT = auto()
-    XT_ZB6_DevKit = auto()
     BL706_NIGHT_LIGHT = auto()
 
     def GnArgName(self):
@@ -60,12 +59,8 @@ def GnArgName(self):
             return 'BL704LDK'
         if self == BouffalolabBoard.BL706DK:
             return 'BL706DK'
-        if self == BouffalolabBoard.BL602_IoT_Matter_V1:
-            return 'BL602-IoT-Matter-V1'
         if self == BouffalolabBoard.BL602_NIGHT_LIGHT:
             return 'BL602-NIGHT-LIGHT'
-        if self == BouffalolabBoard.XT_ZB6_DevKit:
-            return 'XT-ZB6-DevKit'
         if self == BouffalolabBoard.BL706_NIGHT_LIGHT:
             return 'BL706-NIGHT-LIGHT'
         raise Exception('Unknown board #: %r' % self)
@@ -83,7 +78,7 @@ def __init__(self,
                  root,
                  runner,
                  app: BouffalolabApp = BouffalolabApp.LIGHT,
-                 board: BouffalolabBoard = BouffalolabBoard.XT_ZB6_DevKit,
+                 board: BouffalolabBoard = BouffalolabBoard.BL616DK,
                  enable_rpcs: bool = False,
                  module_type: str = "BL706C-22",
                  baudrate=2000000,
@@ -162,8 +157,12 @@ def __init__(self,
             if enable_ethernet or enable_wifi:
                 raise Exception(f"SoC {bouffalo_chip} does NOT support connectivity Ethernet/Wi-Fi currently.")
         elif bouffalo_chip == "bl616":
-            if enable_ethernet:
-                raise Exception(f"SoC {bouffalo_chip} does NOT support connectivity Ethernet currently.")
+            sdk_path = os.path.join(root, os.path.split(os.path.realpath(__file__))[
+                                    0], '../../../third_party/bouffalolab/repo_bouffalo_sdk/VERSION')
+            x, y, z = self.extract_sdk_version(sdk_path)
+            self.argsOpt.append(f'app_ver_x={x}')
+            self.argsOpt.append(f'app_ver_y={y}')
+            self.argsOpt.append(f'app_ver_z={z}')
 
         if enable_thread:
             chip_mdns = "platform"
@@ -183,8 +182,9 @@ def __init__(self,
         if enable_easyflash and enable_littlefs:
             raise Exception("Only one of easyflash and littlefs can be enabled.")
         if bouffalo_chip == "bl616":
-            if not enable_easyflash:
-                enable_littlefs = True
+            if enable_easyflash:
+                raise Exception("BL616 doesn't support easyflash.")
+            enable_littlefs = True
         else:
             if not enable_easyflash and not enable_littlefs:
                 logging.fatal('*' * 80)
@@ -198,8 +198,7 @@ def __init__(self,
 
             self.argsOpt.append('chip_system_config_use_openthread_inet_endpoints=true')
             self.argsOpt.append('chip_with_lwip=false')
-            self.argsOpt.append(f'openthread_project_core_config_file="{bouffalo_chip}-openthread-core-bl-config.h"')
-            self.argsOpt.append('openthread_package_version="7e32165be"')
+            self.argsOpt.append(f'openthread_project_core_config_file="{bouffalo_chip}-openthread-core-config.h"')
 
             if enable_thread_type == BouffalolabThreadType.THREAD_FTD:
                 self.argsOpt.append('chip_openthread_ftd=true')
@@ -208,11 +207,13 @@ def __init__(self,
 
             if not use_matter_openthread:
                 if bouffalo_chip in {"bl702", "bl702l"}:
+                    self.argsOpt.append('openthread_package_version="7e32165be"')
                     self.argsOpt.append(
                         'openthread_root="//third_party/connectedhomeip/third_party/bouffalolab/repo/components/network/thread/openthread"')
                 else:
+                    self.argsOpt.append('openthread_package_version="ed6235304"')
                     self.argsOpt.append(
-                        'openthread_root="//third_party/connectedhomeip/third_party/bouffalolab/bouffalo_sdk/components/wireless/thread/openthread"')
+                        'openthread_root="//third_party/connectedhomeip/third_party/bouffalolab/repo_bouffalo_sdk/components/wireless/thread/openthread"')
 
         if enable_cdc:
             if bouffalo_chip != "bl702":
@@ -263,6 +264,23 @@ def print_enviroment_error(self):
         logging.fatal('\t\texport BOUFFALOLAB_SDK_ROOT="your install path"')
         logging.fatal('*' * 80)
 
+    def extract_sdk_version(self, filepath):
+        pattern = r'PROJECT_SDK_VERSION\s+"([^"]+)"'
+
+        try:
+            with open(filepath, 'r', encoding='utf-8') as f:
+                content = f.read()
+            match = re.search(pattern, content)
+            if match:
+                ver = tuple(int(v) for v in match.group(1).strip().split("."))
+                if len(ver) != 3:
+                    raise Exception('Invalid version format')
+                return ver
+            raise Exception('Invalid version format')
+        except Exception as err:
+            logging.error(f"Failed to extract SDK version: {err}")
+            return (2, 1, 0)
+
     def GnBuildArgs(self):
         return self.argsOpt
 
diff --git a/scripts/build/builders/nxp.py b/scripts/build/builders/nxp.py
index 77942156f3e..82d36c7ac66 100644
--- a/scripts/build/builders/nxp.py
+++ b/scripts/build/builders/nxp.py
@@ -336,6 +336,9 @@ def CmakeBuildFlags(self):
         if self.enable_ethernet and self.os_env == NxpOsUsed.ZEPHYR:
             flags.append('-DEXTRA_CONF_FILE="prj_ethernet.conf"')
 
+        if self.enable_thread and self.os_env == NxpOsUsed.ZEPHYR:
+            flags.append('-DEXTRA_CONF_FILE="prj_thread_ftd.conf"')
+
         if self.has_sw_version_2:
             flags.append("-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2")
             flags.append("-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING=\"2.0\"")
diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
index d42c8b08f18..186df23599e 100644
--- a/scripts/build/builders/telink.py
+++ b/scripts/build/builders/telink.py
@@ -20,6 +20,14 @@
 from .builder import Builder, BuilderOutput
 
 
+class TelinkLogLevel(Enum):
+    DEFAULT = auto()  # default everything
+    ALL = auto()  # enable all logging
+    PROGRESS = auto()  # progress and above
+    ERROR = auto()  # error and above
+    NONE = auto()  # no chip_logging at all
+
+
 class TelinkApp(Enum):
     AIR_QUALITY_SENSOR = auto()
     ALL_CLUSTERS = auto()
@@ -170,6 +178,7 @@ def __init__(self,
                  precompiled_ot_config: bool = False,
                  tflm_config: bool = False,
                  chip_enable_nfc_onboarding_payload: bool = False,
+                 log_level: TelinkLogLevel = TelinkLogLevel.DEFAULT,
                  ):
         super(TelinkBuilder, self).__init__(root, runner)
         self.app = app
@@ -187,6 +196,7 @@ def __init__(self,
         self.precompiled_ot_config = precompiled_ot_config
         self.tflm_config = tflm_config
         self.chip_enable_nfc_onboarding_payload = chip_enable_nfc_onboarding_payload
+        self.log_level = log_level
 
     def get_cmd_prefixes(self):
         if not self._runner.dry_run:
@@ -203,8 +213,7 @@ def get_cmd_prefixes(self):
         return cmd
 
     def generate(self):
-        if os.path.exists(self.output_dir):
-            return
+        os.makedirs(self.output_dir, exist_ok=True)
 
         flags = []
         if self.enable_ota:
@@ -249,6 +258,19 @@ def generate(self):
         if self.options.pregen_dir:
             flags.append(f"-DCHIP_CODEGEN_PREGEN_DIR={shlex.quote(self.options.pregen_dir)}")
 
+        if self.log_level == TelinkLogLevel.DEFAULT:
+            pass
+        elif self.log_level == TelinkLogLevel.ALL:
+            flags.append("-DTLNK_LOG_LEVEL=all")
+        elif self.log_level == TelinkLogLevel.PROGRESS:
+            flags.append("-DTLNK_LOG_LEVEL=progress")
+        elif self.log_level == TelinkLogLevel.ERROR:
+            flags.append("-DTLNK_LOG_LEVEL=error")
+        elif self.log_level == TelinkLogLevel.NONE:
+            flags.append("-DTLNK_LOG_LEVEL=none")
+        else:
+            raise Exception("Unknown log level: %r" % self.log_level)
+
         build_flags = " -- " + " ".join(flags) if len(flags) > 0 else ""
 
         cmd = self.get_cmd_prefixes()
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index 99d7a9ee2a9..908805166ca 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -1,7 +1,7 @@
 ameba-amebad-{all-clusters,all-clusters-minimal,light,light-switch,pigweed}
 asr-{asr550x,asr582x,asr595x}-{all-clusters,all-clusters-minimal,bridge,dishwasher,light-switch,lighting,lock,ota-requestor,refrigerator,temperature-measurement,thermostat}[-factory][-no_logging][-ota][-rio][-rotating_id][-shell]
 android-{androidstudio-arm,androidstudio-arm64,androidstudio-x64,androidstudio-x86,arm,arm64,x64,x86}-{chip-test,chip-tool,java-matter-controller,kotlin-matter-controller,tv-casting-app,tv-server,virtual-device-app}[-no-debug]
-bouffalolab-{bl602-iot-matter-v1,bl602-night-light,bl602dk,bl616dk,bl704ldk,bl706-night-light,bl706dk,xt-zb6-devkit}-{contact-sensor,light}-{ethernet,thread,thread-ftd,thread-mtd,wifi}-{easyflash,littlefs}[-cdc][-coredump][-memmonitor][-mfd][-mot][-rotating_device_id][-rpc][-shell]
+bouffalolab-{bl602-night-light,bl602dk,bl616dk,bl704ldk,bl706-night-light,bl706dk}-{contact-sensor,light}-{ethernet,thread,thread-ftd,thread-mtd,wifi}-{easyflash,littlefs}[-cdc][-coredump][-memmonitor][-mfd][-mot][-rotating_device_id][-rpc][-shell]
 cc32xx-{air-purifier,lock}
 ti-cc13x4_26x4-{lighting,lock,pump,pump-controller}[-ftd][-mtd]
 cyw30739-{cyw30739b2_p5_evk_01,cyw30739b2_p5_evk_02,cyw30739b2_p5_evk_03,cyw930739m2evb_01,cyw930739m2evb_02}-{light,light-switch,lock,thermostat}
@@ -21,4 +21,4 @@ qpg-qpg6200-{light,light-switch,lock,persistent-storage,shell,thermostat}[-updat
 realtek-{rtl8777g,rtl87x2g}-{all-clusters,light-switch,lighting,lock,ota-requestor,thermostat,window}
 stm32-stm32wb5mm-dk-light
 tizen-{arm,arm64}-{all-clusters,chip-tool,light,tests}[-asan][-coverage][-no-ble][-no-thread][-no-wifi][-ubsan][-with-ui]
-telink-{tl3218x,tl3218x_ml3m,tl3218x_retention,tl7218x,tl7218x_ml7g,tl7218x_ml7m,tl7218x_retention,tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-4mb][-compress-lzma][-dfu-smp][-factory-data][-mars][-nfc-payload][-ota][-precompiled-ot][-rpc][-shell][-tflm][-thread-analyzer][-usb]
+telink-{tl3218x,tl3218x_ml3m,tl3218x_retention,tl7218x,tl7218x_ml7g,tl7218x_ml7m,tl7218x_retention,tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-4mb][-compress-lzma][-dfu-smp][-factory-data][-log-all][-log-error][-log-none][-log-progress][-mars][-nfc-payload][-ota][-precompiled-ot][-rpc][-shell][-tflm][-thread-analyzer][-usb]
diff --git a/scripts/build_python.sh b/scripts/build_python.sh
index e1267a48781..705a02a55bf 100755
--- a/scripts/build_python.sh
+++ b/scripts/build_python.sh
@@ -67,6 +67,7 @@ Input Options:
   -b, --enable_ble          <true/false>                    Enable BLE in the controller (default=$enable_ble)
   -p, --enable_wifi_paf     <true/false>                    Enable Wi-Fi PAF discovery in the controller (default=SDK default behavior)
   -4, --enable_ipv4         <true/false>                    Enable IPv4 in the controller (default=$enable_ipv4)
+  -M, --enable_thread_meshcop       <true/false>            Enable Thread Meshcop support.
   -d, --chip_detail_logging <true/false>                    Specify ChipDetailLoggingValue as true or false.
                                                             By default it is $chip_detail_logging.
   -m, --chip_mdns           ChipMDNSValue                   Specify ChipMDNSValue as platform or minimal.
@@ -127,6 +128,15 @@ while (($#)); do
             wifi_paf_config="chip_device_config_enable_wifipaf=$wifi_paf_arg"
             shift
             ;;
+        --enable_thread_meshcop | -M)
+            declare thread_meshcop_arg="$2"
+            if [[ "$thread_meshcop_arg" != "true" && "$thread_meshcop_arg" != "false" ]]; then
+                echo "Error: --enable_thread_meshcop/-M should have a true/false value, not '$thread_meshcop_arg'" >&2
+                exit 1
+            fi
+            thread_meshcop_config="chip_support_thread_meshcop=$thread_meshcop_arg"
+            shift
+            ;;
         --enable_ipv4 | -4)
             enable_ipv4=$2
             if [[ "$enable_ipv4" != "true" && "$enable_ipv4" != "false" ]]; then
@@ -233,6 +243,9 @@ echo "  enable_nfc=\"$enable_nfc\""
 if [[ -n $wifi_paf_config ]]; then
     echo "  $wifi_paf_config"
 fi
+if [[ -n $thread_meshcop_config ]]; then
+    echo "  $thread_meshcop_config"
+fi
 echo "  enable_ipv4=\"$enable_ipv4\""
 echo "  chip_build_controller_dynamic_server=\"$chip_build_controller_dynamic_server\""
 echo "  chip_support_webrtc_python_bindings=\"$enable_webrtc\""
@@ -309,6 +322,9 @@ fi
 if [[ -n $wifi_paf_config ]]; then
     gn_args+=("$wifi_paf_config")
 fi
+if [[ -n $thread_meshcop_config ]]; then
+    gn_args+=("$thread_meshcop_config")
+fi
 # Append extra arguments provided by the user.
 gn_args+=("${extra_gn_args[@]}")
 
diff --git a/scripts/flashing/bouffalolab_firmware_utils.py b/scripts/flashing/bouffalolab_firmware_utils.py
index ac4f2adfede..9cc3285ecae 100755
--- a/scripts/flashing/bouffalolab_firmware_utils.py
+++ b/scripts/flashing/bouffalolab_firmware_utils.py
@@ -582,7 +582,7 @@ def int_to_lhex(intvalue):
             return "%08x" % lhex
 
         def get_tools():
-            bflb_tools = os.path.join(MATTER_ROOT, "third_party/bouffalolab/bouffalo_sdk/tools/bflb_tools")
+            bflb_tools = os.path.join(MATTER_ROOT, "third_party/bouffalolab/repo_bouffalo_sdk/tools/bflb_tools")
             bflb_tools_dict = {
                 "linux": {"fw_proc": "bflb_fw_post_proc/bflb_fw_post_proc-ubuntu", "flash_tool": "bouffalo_flash_cube/BLFlashCommand-ubuntu"},
                 "win32": {"fw_proc": "bflb_fw_post_proc/bflb_fw_post_proc.exe", "flash_tool": "bouffalo_flash_cube/BLFlashCommand.exe"},
diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
index 174f435eaa0..61dafc4dc22 100644
--- a/scripts/setup/constraints.txt
+++ b/scripts/setup/constraints.txt
@@ -106,7 +106,7 @@ markupsafe==2.1.2
     # via jinja2
 matplotlib-inline==0.1.6
     # via ipython
-mobly==1.12.1
+mobly==1.13.0
     # via -r requirements.all.txt
 mypy==1.16.0
     # via
diff --git a/scripts/setup/environment.json b/scripts/setup/environment.json
index 09e31468771..d8b7c8eca9c 100644
--- a/scripts/setup/environment.json
+++ b/scripts/setup/environment.json
@@ -11,6 +11,5 @@
         "gn_args": ["chip_crypto=\"boringssl\""]
     },
     "required_submodules": ["third_party/pigweed/repo"],
-    "rosetta": "never",
     "gni_file": "build_overrides/pigweed_environment.gni"
 }
diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py
index 6dd5d01b111..7543e046b19 100755
--- a/scripts/spec_xml/generate_spec_xml.py
+++ b/scripts/spec_xml/generate_spec_xml.py
@@ -46,7 +46,21 @@
 
 
 CURRENT_IN_PROGRESS_DEFINES = [
-    "cameras"
+    "ambient-context-sensor",
+    "ambientsensing",
+    "cameras",
+    "cameras-image-rotation",
+    "groupcast",
+    "hrap-pdc",
+    "hrap-tbrd",
+    "hvac-thermostat-events",
+    "hvac-thermostat-suggestions",
+    "improved-capabilities-tcr",
+    "partitioned-crl",
+    "security-sensor-events-tcr",
+    "tcr-smokeco-unmounted-state",
+    "temperature-alarm",
+    "thread-commissioning",
 ]
 
 
diff --git a/scripts/spec_xml/spec_revision_diff_summary.py b/scripts/spec_xml/spec_revision_diff_summary.py
index f2c6aa548ee..92e23a6d85c 100644
--- a/scripts/spec_xml/spec_revision_diff_summary.py
+++ b/scripts/spec_xml/spec_revision_diff_summary.py
@@ -210,7 +210,8 @@ def get_all_provisional_device_types(new_revision: PrebuiltDataModelDirectory):
              '1.4.1': PrebuiltDataModelDirectory.k1_4_1,
              '1.4.2': PrebuiltDataModelDirectory.k1_4_2,
              '1.5': PrebuiltDataModelDirectory.k1_5,
-             '1.5.1': PrebuiltDataModelDirectory.k1_5_1}
+             '1.5.1': PrebuiltDataModelDirectory.k1_5_1,
+             '1.6': PrebuiltDataModelDirectory.k1_6}
 
 
 @click.command()
diff --git a/scripts/tests/chiptest/linux.py b/scripts/tests/chiptest/linux.py
index dff18b29ba5..0f37d58aac9 100644
--- a/scripts/tests/chiptest/linux.py
+++ b/scripts/tests/chiptest/linux.py
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
+#    Copyright (c) 2026 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.
@@ -18,210 +18,30 @@
 Handles linux-specific functionality for running test cases
 """
 
-from __future__ import annotations
-
-import asyncio
-import logging
 import os
-import pathlib
-import re
-import shlex
-import subprocess
-import sys
-import threading
-import time
-from typing import IO, Any, Optional, Pattern, Union
-
-import sdbus
-
-from .runner import Executor, LogPipe, SubprocessInfo, SubprocessKind
-from .test_definition import TEST_THREAD_DATASET
-
-log = logging.getLogger(__name__)
-
-test_environ = os.environ.copy()
-
-
-def ensure_network_namespace_availability():
-    if os.getuid() == 0:
-        log.debug("Current user is root")
-        log.warning("Running as root and this will change global namespaces.")
-        return
-
-    os.execvpe(
-        "unshare", ["unshare", "--map-root-user", "-n", "-m", "python3",
-                    sys.argv[0], '--internal-inside-unshare'] + sys.argv[1:],
-        test_environ)
-
-
-def ensure_private_state():
-    log.info("Ensuring /run is privately accessible")
-
-    log.debug("Making / private")
-    if subprocess.run(["mount", "--make-private", "/"]).returncode != 0:
-        log.error("Failed to make / private")
-        log.error("Are you using --privileged if running in docker?")
-        sys.exit(1)
-
-    log.debug("Remounting /run")
-    if subprocess.run(["mount", "-t", "tmpfs", "tmpfs", "/run"]).returncode != 0:
-        log.error("Failed to mount /run as a temporary filesystem")
-        log.error("Are you using --privileged if running in docker?")
-        sys.exit(1)
-
-
-class IsolatedNetworkNamespace:
-    """Helper class to create and remove network namespaces for tests."""
-
-    # Commands for creating appropriate namespaces for a tool and app binaries
-    # in the simulated isolated network.
-    COMMANDS_SETUP = [
-        # Create 2 virtual hosts: for app and for the tool
-        "ip netns add app-{index}",
-        "ip netns add tool-{index}",
-        'sysctl -w net.ipv6.conf.all.forwarding=1',
-        'sysctl -w net.ipv6.conf.default.forwarding=1',
-
-        # Create links for switch to net connections
-        "ip link add {app_link_name}-{index} type veth peer name {app_link_name}-sw-{index}",
-        "ip link add {tool_link_name}-{index} type veth peer name {tool_link_name}-sw-{index}",
-        "ip link add eth-ci-{index} type veth peer name eth-ci-sw-{index}",
-
-        # Link the connections together
-        "ip link set {app_link_name}-{index} netns app-{index}",
-        "ip link set {tool_link_name}-{index} netns tool-{index}",
-
-        # Bridge all the connections together.
-        "ip link add name br1-{index} type bridge",
-        "ip link set br1-{index} up",
-        "ip link set {app_link_name}-sw-{index} master br1-{index}",
-        "ip link set {tool_link_name}-sw-{index} master br1-{index}",
-        "ip link set eth-ci-sw-{index} master br1-{index}",
-
-        # Create link between virtual host 'tool' and the test runner
-        "ip addr add 10.10.10.5/24 dev eth-ci-{index}",
-        "ip link set dev eth-ci-{index} up",
-        "ip link set dev eth-ci-sw-{index} up",
-    ]
-
-    # Bring up application connection link.
-    COMMANDS_APP_LINK_UP = [
-        "ip netns exec app-{index} ip addr add 10.10.10.1/24 dev {app_link_name}-{index}",
-        "ip netns exec app-{index} ip link set dev {app_link_name}-{index} up",
-        "ip netns exec app-{index} ip link set dev lo up",
-        "ip link set dev {app_link_name}-sw-{index} up",
-        "ip netns exec app-{index} ip -6 addr flush {app_link_name}-{index}",
-        "ip netns exec app-{index} ip -6 a add fe80::1/64 dev {app_link_name}-{index}",
-        "ip netns exec app-{index} sysctl -w net.ipv6.conf.{app_link_name}-{index}.accept_ra=2",
-        "ip netns exec app-{index} sysctl -w net.ipv6.conf.{app_link_name}-{index}.accept_ra_rt_info_max_plen=64",
-        'ip netns exec app-{index} sysctl -w net.ipv6.conf.all.forwarding=1',
-        'ip netns exec app-{index} sysctl -w net.ipv6.conf.default.forwarding=1',
-    ]
-
-    COMMANDS_APP_LINK_ULA = [
-        # Force IPv6 to use ULAs that we control.
-        "ip netns exec app-{index} ip -6 a add fd00:0:1:1::1/64 dev {app_link_name}-{index}",
-    ]
-
-    # Bring up tool (controller) connection link.
-    COMMANDS_TOOL_LINK_UP = [
-        "ip netns exec tool-{index} ip addr add 10.10.10.2/24 dev {tool_link_name}-{index}",
-        "ip netns exec tool-{index} ip link set dev {tool_link_name}-{index} up",
-        "ip netns exec tool-{index} ip link set dev lo up",
-        "ip link set dev {tool_link_name}-sw-{index} up",
-        "ip netns exec tool-{index} ip -6 addr flush {tool_link_name}-{index}",
-        "ip netns exec tool-{index} ip -6 a add fe80::2/64 dev {tool_link_name}-{index}",
-        "ip netns exec tool-{index} sysctl -w net.ipv6.conf.{tool_link_name}-{index}.accept_ra=2",
-        "ip netns exec tool-{index} sysctl -w net.ipv6.conf.{tool_link_name}-{index}.accept_ra_rt_info_max_plen=64",
-    ]
-
-    COMMANDS_TOOL_LINK_ULA = [
-        # Force IPv6 to use ULAs that we control.
-        "ip netns exec tool-{index} ip -6 a add fd00:0:1:1::2/64 dev {tool_link_name}-{index}",
-    ]
-
-    # Commands for removing namespaces previously created.
-    COMMANDS_TERMINATE = [
-        "ip link set dev eth-ci-{index} down",
-        "ip link set dev eth-ci-sw-{index} down",
-        "ip addr del 10.10.10.5/24 dev eth-ci-{index}",
+from typing import IO, Any
 
-        "ip link set br1-{index} down",
-        "ip link delete br1-{index}",
+from chiptest.runner import Executor, LogPipe, SubprocessInfo
+from python_path import PythonPath
 
-        "ip link delete eth-ci-sw-{index}",
-        "ip link delete {tool_link_name}-sw-{index}",
-        "ip link delete {app_link_name}-sw-{index}",
+root_dir = os.path.dirname(
+    os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
-        "ip netns del tool-{index}",
-        "ip netns del app-{index}",
-    ]
+with PythonPath(os.path.join(root_dir, 'src/python_testing/matter_testing_infrastructure/matter'), relative_to=__file__):
+    from testing.linux import (BluetoothMock, DBusTestSystemBus, IsolatedNetworkNamespace, ThreadBorderRouter, WpaSupplicantMock,
+                               ensure_network_namespace_availability, ensure_private_state)
 
-    def __init__(self, index: int = 0, setup_app_link_up: bool = True, setup_tool_link_up: bool = True,
-                 app_link_name: str = 'eth-app', tool_link_name: str = 'eth-tool', add_ula: bool = True):
-        self.index = index
-        self.app_link_name = app_link_name
-        self.tool_link_name = tool_link_name
-
-        try:
-            self._setup()
-            if setup_app_link_up:
-                self.setup_app_link_up(add_ula, wait_for_dad=False)
-            if setup_tool_link_up:
-                self._setup_tool_link_up(add_ula, wait_for_dad=False)
-            self._wait_for_duplicate_address_detection()
-        except BaseException:
-            # Ensure that we leave a clean state on any exception.
-            self.terminate()
-            raise
-
-    def netns_for_subprocess_kind(self, kind: SubprocessKind):
-        return "{}-{}".format(kind.name.lower(), self.index)
-
-    def _wait_for_duplicate_address_detection(self):
-        # IPv6 does Duplicate Address Detection even though
-        # we know ULAs provided are isolated. Wait for 'tentative'
-        # address to be gone.
-        log.info("Waiting for IPv6 DaD to complete (no tentative addresses)")
-        for _ in range(100):  # wait at most 10 seconds
-            if 'tentative' not in subprocess.check_output(['ip', 'addr'], text=True):
-                log.info("No more tentative addresses")
-                break
-            time.sleep(0.1)
-        else:
-            log.warning("Some addresses look to still be tentative")
-
-    def _setup(self):
-        self._run(*self.COMMANDS_SETUP)
-
-    def setup_app_link_up(self, add_ula: bool = True, wait_for_dad: bool = True):
-        self._run(*self.COMMANDS_APP_LINK_UP)
-        if add_ula:
-            self._run(*self.COMMANDS_APP_LINK_ULA)
-        if wait_for_dad:
-            self._wait_for_duplicate_address_detection()
-
-    def _setup_tool_link_up(self, add_ula: bool = True, wait_for_dad: bool = True):
-        self._run(*self.COMMANDS_TOOL_LINK_UP)
-        if add_ula:
-            self._run(*self.COMMANDS_TOOL_LINK_ULA)
-        if wait_for_dad:
-            self._wait_for_duplicate_address_detection()
-
-    def _run(self, *command: str):
-        for c in command:
-            c = c.format(app_link_name=self.app_link_name, tool_link_name=self.tool_link_name, index=self.index)
-            log.debug("Executing: '%s'", c)
-            if subprocess.run(shlex.split(c)).returncode != 0:
-                raise RuntimeError(f"Failed to execute '{c}'. Are you using --privileged if running in docker?")
-
-    def terminate(self):
-        """Execute all down commands gracefully omitting errors."""
-        for cmd in self.COMMANDS_TERMINATE:
-            try:
-                self._run(cmd)
-            except Exception as e:
-                log.warning("Encountered error during namespace termination: %s", e)
+__all__ = [
+    "ensure_network_namespace_availability",
+    "ensure_private_state",
+    "BluetoothMock",
+    "DBusTestSystemBus",
+    "IsolatedNetworkNamespace",
+    "LinuxNamespacedExecutor",
+    "ThreadBorderRouter",
+    "WpaSupplicantMock"
+]
 
 
 class LinuxNamespacedExecutor(Executor):
@@ -233,299 +53,3 @@ def run(self, subproc: SubprocessInfo, stdin: IO[Any] | None = None, stdout: IO[
             stderr: IO[Any] | LogPipe | None = None):
         wrapped = subproc.wrap_with("ip", "netns", "exec", self.ns.netns_for_subprocess_kind(subproc.kind))
         return super().run(wrapped, stdin=stdin, stdout=stdout, stderr=stderr)
-
-
-class DBusTestSystemBus(subprocess.Popen[bytes]):
-    """Run a dbus-daemon in a subprocess as a test system bus."""
-
-    SOCKET = pathlib.Path(f"/tmp/chip-dbus-{os.getpid()}")
-    ADDRESS = f"unix:path={SOCKET}"
-
-    def __init__(self):
-        super().__init__(["dbus-daemon", "--session", "--print-address", "--address", self.ADDRESS],
-                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-        os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = self.ADDRESS
-        # Wait for the bus to start (it will print the address to stdout).
-        assert self.stdout is not None, "stdout should have been set to subprocess.PIPE"
-        self.stdout.readline()
-
-    def terminate(self):
-        super().terminate()
-        self.SOCKET.unlink(True)
-        self.wait()
-
-
-class BluetoothMock(subprocess.Popen[str]):
-    """Run a BlueZ mock server in a subprocess."""
-
-    # The MAC addresses of the virtual Bluetooth adapters.
-    ADAPTERS = ["00:00:00:11:11:11", "00:00:00:22:22:22"]
-
-    def __forward_stderr(self):
-        assert self.stderr is not None, "stderr should have been set to subprocess.PIPE"
-        for line in self.stderr:
-            if "adapter[1][00:00:00:22:22:22]" in line:
-                self.event.set()
-            log.debug(line.strip())
-
-    def __init__(self):
-        adapters = [f"--adapter={mac}" for mac in self.ADAPTERS]
-        super().__init__(["bluezoo", "--auto-enable"] + adapters,
-                         stderr=subprocess.PIPE, text=True)
-        self.event = threading.Event()
-        threading.Thread(target=self.__forward_stderr, daemon=True).start()
-        # Wait for the adapters to be ready.
-        self.event.wait()
-
-    def terminate(self):
-        super().terminate()
-        self.wait()
-
-
-DbusAnyT = Union[bool, int, float, str, bytes, list["DbusAnyT"],
-                 tuple["DbusAnyT", ...], dict[str, "DbusAnyT"], "DictVariantT"]
-DictVariantT = dict[str, tuple[str, DbusAnyT]]
-
-
-class ThreadBorderRouter:
-
-    # The Thread radio simulation node id, choose other if there is a conflict.
-    NODE_ID = 9
-
-    def __init__(self, ns: IsolatedNetworkNamespace):
-        self._event = threading.Event()
-        self._pattern: Optional[Pattern[str]] = None
-        self._event.set()
-        self._netns_app = f'app-{ns.index}'
-        self._netns_tool = f'tool-{ns.index}'
-        self._link_name_app = f'{ns.app_link_name}-{ns.index}'
-        self._link_name_tool = f'{ns.tool_link_name}-{ns.index}'
-
-        radio_url = f'spinel+hdlc+forkpty:///usr/bin/env?forkpty-arg=ot-rcp&forkpty-arg={self.NODE_ID}'
-        args = [
-            'ip', 'netns', 'exec', self._netns_app, 'otbr-agent', '-d7', '-v', f'-B{self._link_name_app}', radio_url
-        ]
-
-        self._otbr = subprocess.Popen(args,
-                                      stdout=subprocess.PIPE,
-                                      stderr=subprocess.STDOUT,
-                                      text=True,
-                                      encoding='UTF-8')
-
-        sniffer_cmd = f'ip netns exec {self._netns_app} tcpdump -ilo -U -Zroot -wthread.pcap udp port 9000'
-
-        self._sniffer = subprocess.Popen(sniffer_cmd,
-                                         stdout=sys.stdout,
-                                         stderr=subprocess.STDOUT,
-                                         shell=True)
-
-        threading.Thread(target=self._otbr_read_stdout, daemon=True).start()
-
-        self.expect(r'Co-processor version:', timeout=20)
-        self.join_network(TEST_THREAD_DATASET)
-
-    def join_network(self, dataset):
-        status = os.system(
-            f'ot-ctl dataset init tlvs {dataset} &&'
-            'ot-ctl dataset commit active &&'
-            'ot-ctl ifconfig up &&'
-            'ot-ctl routerselectionjitter 1 &&'
-            'ot-ctl thread start &&'
-            'ot-ctl state leader &&'
-            'while ! ot-ctl state | grep -q leader; do sleep 1; done &&'
-            'ot-ctl netdata show &&'
-            'ot-ctl srp server enable &&'
-            'while ! ot-ctl br state | grep -q running; do sleep 1; done &&'
-            'echo TBR ready'
-        )
-        if status != 0:
-            raise RuntimeError("Failed to control Thread Border Router")
-
-        self.expect(r'Sent RA on infra netif', timeout=15)
-
-    def expect(self, pattern: str, timeout=10):
-        self._pattern = re.compile(pattern)
-        self._event.clear()
-        if not self._event.wait(timeout):
-            raise TimeoutError(f'Failed to expect: {pattern}')
-
-    def _otbr_read_stdout(self):
-        assert self._otbr.stdout is not None
-        while (line := self._otbr.stdout.readline()):
-            log.info(line)
-            if self._event.is_set():
-                continue
-            if not self._pattern:
-                continue
-            if self._pattern.search(line):
-                self._event.set()
-
-    def get_border_agent_port(self) -> int:
-        cmd = f'ip netns exec {self._netns_app} ot-ctl ba port'
-        output = subprocess.check_output(shlex.split(cmd), text=True)
-        # ot-ctl output includes the port number followed by "Done"
-        # Using regex to find the first number in the output
-        match = re.search(r'(\d+)', output)
-        if not match:
-            raise RuntimeError(f"Failed to parse border agent port from: {output}")
-        return int(match.group(1))
-
-    def get_border_agent_host(self) -> str:
-        return '10.10.10.1'
-
-    def terminate(self):
-        if self._otbr:
-            self._otbr.terminate()
-            self._otbr.wait()
-
-        if self._sniffer:
-            self._sniffer.terminate()
-            self._sniffer.wait()
-
-
-class WpaSupplicantMock(threading.Thread):
-    """Mock server for WpaSupplicant D-Bus API.
-
-    This mock runs on its own thread and exposes a minimal subset of the
-    WpaSupplicant D-Bus API to allow Matter devices to interact with it.
-    It allows to create only one interface with one mocked network on it.
-
-    Network SSID and password need to be provided when creating the mock.
-    However, as for now, the password is not actually used for anything, so
-    any password will work and allow to perform AP association. During the
-    association process, between the "associated" and "completed" states,
-    the provided IsolatedNetworkNamespace instance is used to bring up the
-    link to simulate network connectivity.
-    """
-
-    class Wpa(sdbus.DbusInterfaceCommonAsync,
-              interface_name="fi.w1.wpa_supplicant1"):
-        path = "/fi/w1/wpa_supplicant1"
-
-        @sdbus.dbus_method_async("a{sv}", "o")
-        async def CreateInterface(self, args: DictVariantT) -> str:
-            # Always return our pre-defined mock interface.
-            return WpaSupplicantMock.WpaInterface.path
-
-        @sdbus.dbus_method_async("s", "o")
-        async def GetInterface(self, name: str) -> str:
-            # Always return our pre-defined mock interface.
-            return WpaSupplicantMock.WpaInterface.path
-
-    class WpaInterface(sdbus.DbusInterfaceCommonAsync,
-                       interface_name="fi.w1.wpa_supplicant1.Interface"):
-        path = "/fi/w1/wpa_supplicant1/Interfaces/1"
-        state = "disconnected"
-        current_network = "/"
-
-        def __init__(self, mock: WpaSupplicantMock):
-            super().__init__()
-            self.mock = mock
-
-        @sdbus.dbus_method_async("s")
-        async def AutoScan(self, arg: str) -> None:
-            pass
-
-        @sdbus.dbus_method_async("a{sv}")
-        async def Scan(self, args: DictVariantT) -> None:
-            pass
-
-        @sdbus.dbus_method_async("a{sv}", "o")
-        async def AddNetwork(self, args: DictVariantT) -> str:
-            # Always return our pre-defined mock network.
-            return WpaSupplicantMock.WpaNetwork.path
-
-        @sdbus.dbus_method_async("o")
-        async def SelectNetwork(self, path: str) -> None:
-            async def associate():
-                # Mock AP association process.
-                await self.State.set_async("associating")
-                await self.State.set_async("associated")
-                self.mock.networking.setup_app_link_up()
-                await self.State.set_async("completed")
-            await self.CurrentNetwork.set_async(path)
-            asyncio.create_task(associate())
-
-        @sdbus.dbus_method_async("o")
-        async def RemoveNetwork(self, path: str) -> None:
-            await self.CurrentNetwork.set_async("/")
-
-        @sdbus.dbus_method_async()
-        async def RemoveAllNetworks(self) -> None:
-            await self.CurrentNetwork.set_async("/")
-
-        @sdbus.dbus_method_async()
-        async def Disconnect(self) -> None:
-            pass
-
-        @sdbus.dbus_method_async()
-        async def SaveConfig(self) -> None:
-            pass
-
-        @sdbus.dbus_property_async("s")
-        def State(self) -> str:
-            return self.state
-
-        @State.setter_private
-        def State_setter(self, value: str) -> None:
-            self.state = value
-
-        @sdbus.dbus_property_async("o")
-        def CurrentNetwork(self) -> str:
-            return self.current_network
-
-        @CurrentNetwork.setter_private
-        def CurrentNetwork_setter(self, value: str) -> None:
-            self.current_network = value
-
-        @sdbus.dbus_property_async("s")
-        def CurrentAuthMode(self) -> str:
-            return "WPA2-PSK"
-
-    class WpaNetwork(sdbus.DbusInterfaceCommonAsync,
-                     interface_name="fi.w1.wpa_supplicant1.Network"):
-        path = "/fi/w1/wpa_supplicant1/Interfaces/1/Networks/1"
-        enabled = False
-
-        def __init__(self, mock: WpaSupplicantMock):
-            super().__init__()
-            self.mock = mock
-
-        @sdbus.dbus_property_async("a{sv}")
-        def Properties(self) -> DictVariantT:
-            return {"ssid": ("s", self.mock.ssid)}
-
-        @sdbus.dbus_property_async("b")
-        def Enabled(self) -> bool:
-            return self.enabled
-
-        @Enabled.setter
-        def Enabled_setter(self, value: bool) -> None:
-            self.enabled = value
-
-    async def startup(self):
-        # Attach to the system bus which in fact is our mock bus.
-        bus = sdbus.sd_bus_open_system()
-        sdbus.set_default_bus(bus)
-        # Acquire name on the system bus.
-        await bus.request_name_async("fi.w1.wpa_supplicant1", 0)
-        # Expose interfaces of our service.
-        self.wpa = WpaSupplicantMock.Wpa()
-        self.wpa.export_to_dbus(self.wpa.path)
-        self.iface = WpaSupplicantMock.WpaInterface(self)
-        self.iface.export_to_dbus(self.iface.path)
-        self.net = WpaSupplicantMock.WpaNetwork(self)
-        self.net.export_to_dbus(self.net.path)
-
-    def __init__(self, ssid: str, password: str, ns: IsolatedNetworkNamespace):
-        self.ssid = ssid
-        self.password = password
-        self.networking = ns
-        self.loop = asyncio.new_event_loop()
-        self.loop.run_until_complete(self.startup())
-        super().__init__(target=self.loop.run_forever)
-        self.start()
-
-    def terminate(self):
-        self.loop.call_soon_threadsafe(self.loop.stop)
-        self.join()
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
index 2209ba182d0..d93565ecdf4 100644
--- a/scripts/tests/chiptest/test_definition.py
+++ b/scripts/tests/chiptest/test_definition.py
@@ -510,7 +510,8 @@ def _RunImpl(self, target: TestTarget, runner: Runner, apps_register: AppsRegist
                     if op_network == 'Thread':
                         # The node id must not conflict with ThreadBorderRouter.NODE_ID
                         subproc = subproc.with_args("--thread-node-id=2")
-                    elif ble_controller_app is not None:
+
+                    if ble_controller_app is not None:
                         subproc = subproc.with_args("--ble-controller", str(ble_controller_app))
                         if op_network == 'WiFi':
                             subproc = subproc.with_args("--wifi")
@@ -576,7 +577,7 @@ def _RunImpl(self, target: TestTarget, runner: Runner, apps_register: AppsRegist
                         pairing_server_args = ["--ble-controller", str(ble_controller_tool)]
                 elif op_network == 'Thread' and thread_ba_host is not None and thread_ba_port is not None:
                     pairing_cmd = pairing_cmd.with_args(
-                        "pairing", "code-thread", TEST_NODE_ID, f"hex:{TEST_THREAD_DATASET}", setupCode,
+                        "pairing", "thread-meshcop", TEST_NODE_ID, f"hex:{TEST_THREAD_DATASET}", setupCode,
                         "--thread-ba-host", thread_ba_host, "--thread-ba-port", str(thread_ba_port))
                 else:
                     pairing_cmd = pairing_cmd.with_args('pairing', 'code', TEST_NODE_ID, setupCode)
diff --git a/scripts/tests/run_python_test.py b/scripts/tests/run_python_test.py
index 6a59e25d064..1c01bdf8f4e 100755
--- a/scripts/tests/run_python_test.py
+++ b/scripts/tests/run_python_test.py
@@ -15,7 +15,9 @@
 # limitations under the License.
 
 import contextlib
+import dataclasses
 import datetime
+import enum
 import glob
 import io
 import logging
@@ -93,33 +95,40 @@ def forward_fifo(path: str, f_out: typing.BinaryIO, stop_event: threading.Event)
         os.unlink(path)
 
 
+@dataclasses.dataclass
+class TestRunConfig:
+    """Configuration for the app under test."""
+    app: str
+    app_args: str
+    script_args: str
+    app_ready_pattern: typing.Optional[str]
+    stream_output: typing.BinaryIO
+    app_stdin_pipe: typing.Optional[str] = None
+
+
 class AppProcessManager:
-    def __init__(self, app: str, app_args: str, app_ready_pattern: typing.Optional[str], stream_output: typing.BinaryIO, app_stdin_pipe: typing.Optional[str] = None):
-        self.app = app
-        self.app_args = app_args
-        self.app_ready_pattern = app_ready_pattern
-        self.stream_output = stream_output
-        self.app_stdin_pipe = app_stdin_pipe
+    def __init__(self, config: TestRunConfig):
+        self.config = config
         self.app_process = None
         self.stdin_thread = None
         self.stdin_stop_event = threading.Event()
 
     def start(self):
-        log.info("Starting app with args: '%s'", self.app_args)
-        if self.app_ready_pattern and isinstance(self.app_ready_pattern, str):
-            ready_pattern = re.compile(self.app_ready_pattern.encode())
+        log.info("Starting app with args: '%s'", self.config.app_args)
+        if self.config.app_ready_pattern and isinstance(self.config.app_ready_pattern, str):
+            ready_pattern = re.compile(self.config.app_ready_pattern.encode())
         else:
-            ready_pattern = self.app_ready_pattern
-        self.app_process = Subprocess(self.app, *shlex.split(self.app_args),
+            ready_pattern = self.config.app_ready_pattern
+        self.app_process = Subprocess(self.config.app, *shlex.split(self.config.app_args),
                                       output_cb=process_chip_app_output,
-                                      f_stdout=self.stream_output,
-                                      f_stderr=self.stream_output)
+                                      f_stdout=self.config.stream_output,
+                                      f_stderr=self.config.stream_output)
         self.app_process.start(expected_output=ready_pattern, timeout=30)
-        if self.app_stdin_pipe:
-            log.info("Forwarding stdin from '%s' to app", self.app_stdin_pipe)
+        if self.config.app_stdin_pipe:
+            log.info("Forwarding stdin from '%s' to app", self.config.app_stdin_pipe)
             self.stdin_stop_event.clear()
             self.stdin_thread = threading.Thread(
-                target=forward_fifo, args=(self.app_stdin_pipe, self.app_process.p.stdin, self.stdin_stop_event))
+                target=forward_fifo, args=(self.config.app_stdin_pipe, self.app_process.p.stdin, self.stdin_stop_event))
             self.stdin_thread.start()
         else:
             self.app_process.p.stdin.close()
@@ -233,21 +242,10 @@ def main_impl(app: str, factory_reset: bool, factory_reset_app_only: bool, app_a
     test_run_id = str(uuid.uuid4())[:8]  # Use first 8 characters for shorter paths
     restart_flag_file = f"/tmp/chip_test_restart_app_{test_run_id}"
 
+    # Remove app config and storage if factory reset is requested
     if factory_reset or factory_reset_app_only:
-        # Remove native app config
-        for path in glob.glob('/tmp/chip*') + glob.glob('/tmp/repl*'):
-            pathlib.Path(path).unlink(missing_ok=True)
-
-        # Remove native app KVS if that was used
-        if match := re.search(r"--KVS (?P<path>[^ ]+)", app_args):
-            log.info("Removing KVS path: '%s'", match.group("path"))
-            pathlib.Path(match.group("path")).unlink(missing_ok=True)
-
-    if factory_reset:
-        # Remove Python test admin storage if provided
-        if match := re.search(r"--storage-path (?P<path>[^ ]+)", script_args):
-            log.info("Removing storage path: '%s'", match.group("path"))
-            pathlib.Path(match.group("path")).unlink(missing_ok=True)
+        reset_type = FactoryResetType.AppAndController if factory_reset else FactoryResetType.AppOnly
+        factory_reset_config_removal(app_args, script_args, reset_type)
 
     app_manager_ref = None
     app_manager_lock = threading.Lock()
@@ -260,7 +258,8 @@ def main_impl(app: str, factory_reset: bool, factory_reset_app_only: bool, app_a
         if not os.path.exists(app):
             if app is None:
                 raise FileNotFoundError(f"{app} not found")
-        app_manager = AppProcessManager(app, app_args, app_ready_pattern, stream_output, app_stdin_pipe)
+        app_config = TestRunConfig(app, app_args, script_args, app_ready_pattern, stream_output, app_stdin_pipe)
+        app_manager = AppProcessManager(app_config)
         app_manager.start()
         app_manager_ref = [app_manager]
         restart_monitor_thread = threading.Thread(
@@ -268,11 +267,7 @@ def main_impl(app: str, factory_reset: bool, factory_reset_app_only: bool, app_a
             args=(
                 app_manager_ref,
                 app_manager_lock,
-                app,
-                app_args,
-                app_ready_pattern,
-                stream_output,
-                app_stdin_pipe,
+                app_config,
                 restart_flag_file),
             daemon=True)
         restart_monitor_thread.start()
@@ -364,28 +359,71 @@ def main_impl(app: str, factory_reset: bool, factory_reset_app_only: bool, app_a
 def monitor_app_restart_requests(
         app_manager_ref,
         app_manager_lock,
-        app,
-        app_args,
-        app_ready_pattern,
-        stream_output,
-        app_stdin_pipe,
+        config: TestRunConfig,
         restart_flag_file):
-    while True:
-        try:
-            if os.path.exists(restart_flag_file):
-                log.info("App restart requested by test script")
-                # Remove the flag file immediately to prevent multiple restarts
-                os.unlink(restart_flag_file)
 
-                new_app_manager = AppProcessManager(app, app_args, app_ready_pattern, stream_output, app_stdin_pipe)
-                app_manager_ref[0].stop()
-                with app_manager_lock:
-                    new_app_manager.start()
-                    app_manager_ref[0] = new_app_manager
-                    log.info("App restart completed")
+    while True:
+        # Try to read the restart flag file
+        if not os.path.exists(restart_flag_file):
             time.sleep(0.5)
-        except Exception as e:
-            log.error("Error in app restart monitor: %r", e)
+            continue
+
+        with open(restart_flag_file, 'r') as f:
+            flag_file_content = f.read().strip()
+
+        # Determine reset type and remove app/ctrl config and storage
+        reset_type = None
+        if flag_file_content == "factory reset":
+            reset_type = FactoryResetType.AppAndController
+
+        elif flag_file_content == "factory reset app only":
+            reset_type = FactoryResetType.AppOnly
+
+        if reset_type:
+            factory_reset_config_removal(config.app_args, config.script_args, reset_type)
+
+        # Restart the app
+        log.info("Restarting app '%s'...", config.app)
+        new_app_manager = AppProcessManager(config)
+        app_manager_ref[0].stop()
+        with app_manager_lock:
+            new_app_manager.start()
+            app_manager_ref[0] = new_app_manager
+
+        # Successfully read the flag file, remove to prevent multiple restarts
+        os.unlink(restart_flag_file)
+        log.info("%s requested by test script", flag_file_content.capitalize())
+
+        # Action complete, continue monitoring for additional restart requests
+        log.info("%s completed, continuing to monitor for additional requests", flag_file_content.capitalize())
+
+
+class FactoryResetType(enum.Enum):
+    """Type of factory reset to perform."""
+    AppOnly = 0
+    AppAndController = 1
+
+    def config_files(self, app_args: str, script_args: str) -> typing.Generator[str, None, None]:
+        """Yield paths of config/storage files to remove for this reset type."""
+
+        # App config files and KVS, exclude restart flag file
+        yield from (f for f in glob.glob('/tmp/chip*') if not os.path.basename(f).startswith('chip_test_restart_app'))
+        yield from glob.glob('/tmp/repl*')
+
+        if match := re.search(r"--KVS (?P<path>[^ ]+)", app_args):
+            yield match.group("path")
+
+        if self == FactoryResetType.AppAndController:
+            # Controller storage
+            if match := re.search(r"--storage-path (?P<path>[^ ]+)", script_args):
+                yield match.group("path")
+
+
+def factory_reset_config_removal(app_args: str, script_args: str, reset_type: FactoryResetType = None):
+    """Handles app factory reset requests by removing configuration and storage files."""
+    for path in reset_type.config_files(app_args, script_args):
+        log.info("Removing config/storage file, path: '%s'...", path)
+        pathlib.Path(path).unlink(missing_ok=True)
 
 
 if __name__ == '__main__':
diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py
index 9493aa2e067..fe13c767352 100755
--- a/scripts/tests/run_test_suite.py
+++ b/scripts/tests/run_test_suite.py
@@ -31,12 +31,11 @@
 from chiptest.accessories import AppsRegister
 from chiptest.glob_matcher import GlobMatcher
 from chiptest.runner import Executor, SubprocessKind
-from chiptest.test_definition import SubprocessInfoRepo, TestDefinition, TestRunTime, TestTag
+from chiptest.test_definition import TEST_THREAD_DATASET, SubprocessInfoRepo, TestDefinition, TestRunTime, TestTag
 from chipyaml.paths_finder import PathsFinder
 
 log = logging.getLogger(__name__)
 
-# If running on Linux platform load the Linux specific code.
 if sys.platform == "linux":
     import chiptest.linux
 
@@ -534,11 +533,11 @@ def cleanup() -> None:
             elif commissioning_method == 'ble-thread':
                 to_terminate.append(chiptest.linux.DBusTestSystemBus())
                 to_terminate.append(chiptest.linux.BluetoothMock())
-                to_terminate.append(chiptest.linux.ThreadBorderRouter(ns))
+                to_terminate.append(chiptest.linux.ThreadBorderRouter(TEST_THREAD_DATASET, ns))
                 ble_controller_app = 0   # Bind app to the first BLE controller
                 ble_controller_tool = 1  # Bind tool to the second BLE controller
             elif commissioning_method == 'thread-meshcop':
-                to_terminate.append(tbr := chiptest.linux.ThreadBorderRouter(ns))
+                to_terminate.append(tbr := chiptest.linux.ThreadBorderRouter(TEST_THREAD_DATASET, ns))
                 thread_ba_host = tbr.get_border_agent_host()
                 thread_ba_port = tbr.get_border_agent_port()
 
diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py
index 094d8433edd..29b954d36c4 100644
--- a/scripts/tools/check_includes_config.py
+++ b/scripts/tools/check_includes_config.py
@@ -55,6 +55,41 @@
     '/platform/ASR/',
     '/platform/NuttX/',
     r'POSIX\.h$',
+
+    # These run on large systems, so no restrictions
+    #   - bridges
+    #   - cameras
+    #   - commissioners
+    #   - commodity tariff
+    #   - JF devices
+    #   - media devices
+    # keep-sorted: start
+    'src/app/app-platform/',
+    'src/app/clusters/application-basic-server/',
+    'src/app/clusters/application-launcher-server/',
+    'src/app/clusters/audio-output-server/',
+    'src/app/clusters/bridged-device-basic-information-server/',
+    'src/app/clusters/camera-av-settings-user-level-management-server/',
+    'src/app/clusters/camera-av-stream-management-server/',
+    'src/app/clusters/channel-server/',
+    'src/app/clusters/commodity-tariff-server/',
+    'src/app/clusters/content-launch-server/',
+    'src/app/clusters/ecosystem-information-server/',
+    'src/app/clusters/media-input-server/',
+    'src/app/clusters/media-playback-server/',
+    'src/app/clusters/push-av-stream-transport-server/',
+    'src/app/clusters/target-navigator-server/',
+    'src/app/clusters/webrtc-transport-provider-server/',
+    'src/app/clusters/webrtc-transport-requestor-server/',
+    'src/app/clusters/zone-management-server/',
+    'src/controller/',
+    'src/credentials/jcm/',
+    'src/lib/support/jsontlv/',
+    'src/setup_payload/',
+    'src/tracing/esp32_diagnostics/',
+    'src/tracing/esp32_trace/',
+    'src/tracing/json/',
+    # keep-sorted: end
 }
 
 
@@ -121,93 +156,23 @@
     'src/system/SystemClock.h': {'chrono'},
     'src/lib/core/StringBuilderAdapters.h': {'chrono'},
 
-    'src/app/app-platform/ContentApp.h': {'list', 'string'},
-    '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'},
-    # EcosystemInformationCluster is for Fabric Sync and is intended to run on device that are capable of handling these types.
-    'src/app/clusters/ecosystem-information-server/ecosystem-information-server.h': {'map', 'string', 'vector'},
-    'src/app/clusters/channel-server/channel-delegate.h': {'list'},
-    'src/app/clusters/content-launch-server/content-launch-delegate.h': {'list'},
-    'src/app/clusters/content-launch-server/content-launch-server.cpp': {'list'},
-    'src/app/clusters/media-input-server/media-input-delegate.h': {'list'},
-    'src/app/clusters/media-playback-server/media-playback-delegate.h': {'list'},
-    'src/app/clusters/target-navigator-server/target-navigator-delegate.h': {'list'},
-    # WebRTCTransportProvider is for Camera and is intended to run on devices that are capable of handling these types.
-    'src/app/clusters/webrtc-transport-provider-server/WebRTCTransportProviderCluster.h': {'string', 'vector'},
-    # Camera AV Stream Management and Camera AV Settings User Level Management clusters are expected to run on resource-capable devices
-    'src/app/clusters/camera-av-stream-management-server/CameraAVStreamManagementCluster.h': {'vector'},
-    'src/app/clusters/camera-av-stream-management-server/CameraAVStreamManagementCluster.cpp': {'set'},
-    'src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h': {'string', 'vector'},
-    'src/app/clusters/webrtc-transport-requestor-server/WebRTCTransportRequestorCluster.h': {'string', 'vector'},
-    'src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-server.h': {'vector'},
-    'src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-delegate.h': {'vector'},
-    'src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-storage.h': {'vector'},
-    'src/app/clusters/push-av-stream-transport-server/PushAVStreamTransportLogic.cpp': {'set'},
-    'src/app/clusters/push-av-stream-transport-server/PushAVStreamTransportLogic.h': {'vector'},
-    'src/app/clusters/zone-management-server/zone-management-server.h': {'vector'},
-    'src/app/clusters/zone-management-server/zone-geometry.h': {'vector', 'set'},
     'src/credentials/attestation_verifier/FileAttestationTrustStore.h': {'vector'},
     'src/credentials/attestation_verifier/FileAttestationTrustStore.cpp': {'string'},
     'src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp': {'fstream'},
-    # Commodity Tariff Cluster are expected to run on resource-capable devices
-    'src/app/clusters/commodity-tariff-server/CommodityTariffAttrsDataMgmt.h': {'map', 'set', 'unordered_map', 'unordered_set', 'string'},
-
-    'src/setup_payload/AdditionalDataPayload.h': {'string'},
-    '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'},
 
     # Uses platform-define to switch between list and array
     'src/lib/dnssd/minimal_mdns/ResponseSender.h': {'list'},
 
-    # Not really for embedded consumers, because commissioners tend to not be embedded.
-    'src/controller/SetUpCodePairer.h': {'deque', 'vector'},
-    'src/controller/SetUpCodePairer.cpp': {'vector'},
-
-    'src/controller/ExamplePersistentStorage.cpp': {'fstream', 'string', 'map'},
-    'src/controller/ExamplePersistentStorage.h': {'string'},
-    'src/credentials/jcm/TrustVerification.h': {'string'},
-    'src/credentials/jcm/VendorIdVerificationClient.h': {'string'},
-
-    # Library meant for non-embedded
-    'src/tracing/json/json_tracing.cpp': {'string', 'sstream'},
-    'src/tracing/json/json_tracing.h': {'fstream', 'unordered_map', 'string'},
-
-    # esp32 diagnostic tracing
-    'src/tracing/esp32_diagnostics/Counter.h': {'map'},
-    'src/tracing/esp32_diagnostics/DiagnosticTracing.h': {'unordered_set'},
-
-    # esp32 tracing
-    'src/tracing/esp32_trace/esp32_tracing.h': {'unordered_map'},
-
     # Not intended for embedded clients
     'src/app/PendingResponseTrackerImpl.h': {'unordered_set'},
 
     # Not intended for embedded clients
     'src/lib/core/TLVVectorWriter.cpp': {'vector'},
     'src/lib/core/TLVVectorWriter.h': {'vector'},
-    'src/lib/support/jsontlv/JsonToTlv.cpp': {'sstream', 'string', 'vector'},
-    'src/lib/support/jsontlv/JsonToTlv.h': {'string'},
-    'src/lib/support/jsontlv/TlvToJson.h': {'string'},
-    'src/lib/support/jsontlv/TextFormat.h': {'string'},
     'src/lib/support/TemporaryFileStream.h': {'ostream', 'streambuf', 'string'},
     'src/app/icd/client/DefaultICDClientStorage.cpp': {'vector'},
     'src/app/icd/client/DefaultICDClientStorage.h': {'vector'},
     'src/app/icd/client/DefaultICDStorageKey.h': {'vector'},
-    'src/controller/CHIPDeviceController.cpp': {'string'},
     'src/qrcodetool/setup_payload_commands.cpp': {'string'},
     'src/access/AccessRestrictionProvider.h': {'vector', 'map'},
     # nrfconnect test runner
@@ -216,9 +181,4 @@
     # Not intended for embedded clients
     'src/app/server/JointFabricDatastore.cpp': {'vector', 'unordered_set'},
     'src/app/server/JointFabricDatastore.h': {'vector', 'unordered_set'},
-
-    # For webrtc python bindings
-    'src/controller/webrtc/WebRTC.h': {'string'},
-    'src/controller/webrtc/WebRTCClient.h': {'map', 'string'},
-    'src/controller/webrtc/WebRTCTransportRequestorManager.cpp': {'string', 'vector'},
 }
diff --git a/scripts/tools/zap/generate.py b/scripts/tools/zap/generate.py
index 4e6a2f7c700..6a2a49afa1d 100755
--- a/scripts/tools/zap/generate.py
+++ b/scripts/tools/zap/generate.py
@@ -77,8 +77,34 @@ def checkDirExists(path):
 
 
 def getFilePath(name, prefix_chip_root_dir=True):
-    if prefix_chip_root_dir:
+    """Resolve a file path and verify that it exists.
+
+    Resolution is attempted in the following order:
+
+    1. If ``name`` is absolute, use it directly.
+    2. If ``prefix_chip_root_dir`` is True and ``name`` is relative, resolve
+       it against the repository root (``CHIP_ROOT_DIR``).  This is the
+       legacy behaviour and is tried first to preserve backward compatibility.
+    3. If (2) does not yield an existing file, resolve ``name`` against the
+       current working directory as a fallback.
+
+    In all cases the resolved path is validated with :func:`checkFileExists`;
+    if the file is not found the program exits with an error message.
+
+    Args:
+        name (str): A file path, either absolute or relative.
+        prefix_chip_root_dir (bool): When True (the default), relative paths
+            are first resolved against ``CHIP_ROOT_DIR``.  When False, ``name``
+            is used as-is (typically because the caller has already produced an
+            absolute path, e.g. via environment-variable expansion).
+
+    Returns:
+        str: The resolved, verified absolute path to the file.
+    """
+    if prefix_chip_root_dir and not os.path.isabs(name):
         fullpath = os.path.join(CHIP_ROOT_DIR, name)
+        if not os.path.isfile(fullpath):
+            fullpath = os.path.join(os.getcwd(), name)
     else:
         fullpath = name
     checkFileExists(fullpath)
@@ -86,7 +112,12 @@ def getFilePath(name, prefix_chip_root_dir=True):
 
 
 def getDirPath(name):
-    fullpath = os.path.join(CHIP_ROOT_DIR, name)
+    if not os.path.isabs(name):
+        fullpath = os.path.join(CHIP_ROOT_DIR, name)
+        if not os.path.isdir(fullpath):
+            fullpath = os.path.join(os.getcwd(), name)
+    else:
+        fullpath = name
     checkDirExists(fullpath)
     return fullpath
 
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index 5e14e592f79..8d1fc17ca19 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -62,7 +62,7 @@
       ],
       "deviceVersions": [
         1,
-        1
+        5
       ],
       "deviceIdentifiers": [
         17,
@@ -2760,6 +2760,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -5475,6 +5491,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
@@ -5901,7 +5933,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
@@ -9779,6 +9811,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "Unmounted",
+              "code": 13,
+              "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": "FeatureMap",
               "code": 65532,
@@ -22563,7 +22611,7 @@
         }
       ],
       "deviceVersions": [
-        1,
+        4,
         1
       ],
       "deviceIdentifiers": [
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 3eda7249747..ca163d00e66 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        5
       ],
       "deviceIdentifiers": [
         22
@@ -1723,6 +1723,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "DeviceLoadStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DeviceLoadStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3999,6 +4015,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GroupcastAdoption",
+              "code": 4,
+              "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,
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenCallback.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenCallback.h
index 2c0972c1f26..22e22c16031 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenCallback.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenCallback.h
@@ -161,6 +161,10 @@ void MatterIlluminanceMeasurementClusterInitCallback(chip::EndpointId endpointId
 
 void MatterIlluminanceMeasurementClusterShutdownCallback(chip::EndpointId endpointId, MatterClusterShutdownType shutdownType);
 
+void MatterTemperatureMeasurementClusterInitCallback(chip::EndpointId endpointId);
+
+void MatterTemperatureMeasurementClusterShutdownCallback(chip::EndpointId endpointId, MatterClusterShutdownType shutdownType);
+
 void MatterOccupancySensingClusterInitCallback(chip::EndpointId endpointId);
 
 void MatterOccupancySensingClusterShutdownCallback(chip::EndpointId endpointId, MatterClusterShutdownType shutdownType);
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenInitShutdown.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenInitShutdown.cpp
index 83769fd38ff..91992afc879 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenInitShutdown.cpp
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CodeDrivenInitShutdown.cpp
@@ -130,6 +130,9 @@ void MatterClusterServerInitCallback(EndpointId endpoint, ClusterId clusterId)
     case app::Clusters::IlluminanceMeasurement::Id:
         MatterIlluminanceMeasurementClusterInitCallback(endpoint);
         break;
+    case app::Clusters::TemperatureMeasurement::Id:
+        MatterTemperatureMeasurementClusterInitCallback(endpoint);
+        break;
     case app::Clusters::OccupancySensing::Id:
         MatterOccupancySensingClusterInitCallback(endpoint);
         break;
@@ -251,6 +254,9 @@ void MatterClusterServerShutdownCallback(EndpointId endpoint, ClusterId clusterI
     case app::Clusters::IlluminanceMeasurement::Id:
         MatterIlluminanceMeasurementClusterShutdownCallback(endpoint, shutdownType);
         break;
+    case app::Clusters::TemperatureMeasurement::Id:
+        MatterTemperatureMeasurementClusterShutdownCallback(endpoint, shutdownType);
+        break;
     case app::Clusters::OccupancySensing::Id:
         MatterOccupancySensingClusterShutdownCallback(endpoint, shutdownType);
         break;
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
index 947a0ff3273..9b80bce916e 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -38,7 +38,7 @@
     0x00000031, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    0x0000003F, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
@@ -67,7 +67,7 @@
     0x00000006, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     0x00000007, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0x00000000, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    0x00000004, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
@@ -96,7 +96,7 @@
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
@@ -134,6 +134,7 @@
     0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0x0000003F, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     0x00000041, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     0x0000005C, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
     0x00000099, /* Cluster: Energy EVSE, Attribute: UserMaximumChargeCurrent, Privilege: manage */ \
@@ -188,6 +189,7 @@
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0x00000004, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     0x00000000, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     0x0000000B, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
     0x00000009, /* Cluster: Energy EVSE, Attribute: UserMaximumChargeCurrent, Privilege: manage */ \
@@ -242,6 +244,7 @@
     chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     chip::Access::Privilege::kManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     chip::Access::Privilege::kManage, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     chip::Access::Privilege::kManage, /* Cluster: Smoke CO Alarm, Attribute: SmokeSensitivityLevel, Privilege: manage */ \
     chip::Access::Privilege::kManage, /* Cluster: Energy EVSE, Attribute: UserMaximumChargeCurrent, Privilege: manage */ \
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index 46945559dbe..b120c4946ff 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -591,7 +591,7 @@
     }
 
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 1029
+#define GENERATED_ATTRIBUTE_COUNT 1032
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -822,6 +822,8 @@
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ActiveNetworkFaults */                         \
         { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                                   \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TestEventTriggersEnabled */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DeviceLoadStatus */                            \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32),                                                                  \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */                                  \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
@@ -1110,6 +1112,9 @@
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupsPerFabric */                          \
         { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupKeysPerFabric */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupcastAdoption */                                                              \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32),                                                                  \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */                                  \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
@@ -1436,6 +1441,7 @@
         { ZAP_MIN_MAX_DEFAULTS_INDEX(7), 0x0000000B, 1, ZAP_TYPE(ENUM8),                                                           \
           ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SmokeSensitivityLevel */ \
         { ZAP_SIMPLE_DEFAULT(0), 0x0000000C, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(READABLE) },     /* ExpiryDate */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000D, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(READABLE) },     /* Unmounted */             \
         { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) },    /* FeatureMap */            \
         { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) },      /* ClusterRevision */       \
                                                                                                                                    \
@@ -2092,15 +2098,18 @@
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */                             \
                                                                                                                                    \
         /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                               \
-        { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE),                                                        \
-          ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(TEMPERATURE),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                                                                  \
         { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE),                                                        \
           ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                                    \
         { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE),                                                        \
-          ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                            /* MaxMeasuredValue */         \
-        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) },     /* Tolerance */                \
-        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */               \
-        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) },   /* ClusterRevision */          \
+          ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* MaxMeasuredValue */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) }, /* Tolerance */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */                             \
                                                                                                                                    \
         /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                                  \
         { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S),                                                             \
@@ -3692,7 +3701,7 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033, \
       .attributes = ZAP_ATTRIBUTE_INDEX(96), \
-      .attributeCount = 11, \
+      .attributeCount = 12, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
@@ -3704,7 +3713,7 @@
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(107), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(108), \
       .attributeCount = 6, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3717,7 +3726,7 @@
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(113), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(114), \
       .attributeCount = 65, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3730,7 +3739,7 @@
   { \
       /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
       .clusterId = 0x00000036, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3743,7 +3752,7 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(193), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(194), \
       .attributeCount = 11, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3756,7 +3765,7 @@
   { \
       /* Endpoint: 0, Cluster: Time Synchronization (server) */ \
       .clusterId = 0x00000038, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
       .attributeCount = 14, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3769,7 +3778,7 @@
   { \
       /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \
       .clusterId = 0x0000003C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
       .attributeCount = 5, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3782,7 +3791,7 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(224), \
       .attributeCount = 8, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3795,8 +3804,8 @@
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(231), \
-      .attributeCount = 6, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(232), \
+      .attributeCount = 7, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
@@ -3808,7 +3817,7 @@
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(239), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3821,7 +3830,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(240), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3834,7 +3843,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3847,7 +3856,7 @@
   { \
       /* Endpoint: 0, Cluster: Fault Injection (server) */ \
       .clusterId = 0xFFF1FC06, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(248), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(250), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3860,7 +3869,7 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(250), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
       .attributeCount = 4, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3873,7 +3882,7 @@
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(254), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(256), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3886,7 +3895,7 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(257), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -3899,7 +3908,7 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(257), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -3912,7 +3921,7 @@
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(264), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -3925,7 +3934,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(280), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(282), \
       .attributeCount = 7, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3938,7 +3947,7 @@
   { \
       /* Endpoint: 1, Cluster: Binding (server) */ \
       .clusterId = 0x0000001E, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(287), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(289), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3951,7 +3960,7 @@
   { \
       /* Endpoint: 1, Cluster: Actions (server) */ \
       .clusterId = 0x00000025, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(292), \
       .attributeCount = 5, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3964,7 +3973,7 @@
   { \
       /* Endpoint: 1, Cluster: Power Source (server) */ \
       .clusterId = 0x0000002F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(295), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(297), \
       .attributeCount = 9, \
       .clusterSize = 70, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3977,7 +3986,7 @@
   { \
       /* Endpoint: 1, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(304), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(306), \
       .attributeCount = 4, \
       .clusterSize = 5, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3990,7 +3999,7 @@
   { \
       /* Endpoint: 1, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(308), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(310), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4003,7 +4012,7 @@
   { \
       /* Endpoint: 1, Cluster: User Label (server) */ \
       .clusterId = 0x00000041, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(311), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(313), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4016,7 +4025,7 @@
   { \
       /* Endpoint: 1, Cluster: Boolean State (server) */ \
       .clusterId = 0x00000045, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(314), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(316), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4029,7 +4038,7 @@
   { \
       /* Endpoint: 1, Cluster: Oven Cavity Operational State (server) */ \
       .clusterId = 0x00000048, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(317), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(319), \
       .attributeCount = 8, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4042,7 +4051,7 @@
   { \
       /* Endpoint: 1, Cluster: Oven Mode (server) */ \
       .clusterId = 0x00000049, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(325), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(327), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4055,7 +4064,7 @@
   { \
       /* Endpoint: 1, Cluster: Laundry Dryer Controls (server) */ \
       .clusterId = 0x0000004A, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(329), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(331), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4068,7 +4077,7 @@
   { \
       /* Endpoint: 1, Cluster: Mode Select (server) */ \
       .clusterId = 0x00000050, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(333), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(335), \
       .attributeCount = 9, \
       .clusterSize = 77, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4081,7 +4090,7 @@
   { \
       /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */ \
       .clusterId = 0x00000051, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(342), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(344), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4094,7 +4103,7 @@
   { \
       /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */ \
       .clusterId = 0x00000052, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(346), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(348), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4107,7 +4116,7 @@
   { \
       /* Endpoint: 1, Cluster: Laundry Washer Controls (server) */ \
       .clusterId = 0x00000053, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(350), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(352), \
       .attributeCount = 6, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4120,7 +4129,7 @@
   { \
       /* Endpoint: 1, Cluster: RVC Run Mode (server) */ \
       .clusterId = 0x00000054, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(356), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(358), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4133,7 +4142,7 @@
   { \
       /* Endpoint: 1, Cluster: RVC Clean Mode (server) */ \
       .clusterId = 0x00000055, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(360), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(362), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4146,7 +4155,7 @@
   { \
       /* Endpoint: 1, Cluster: Temperature Control (server) */ \
       .clusterId = 0x00000056, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(364), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(366), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4159,7 +4168,7 @@
   { \
       /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */ \
       .clusterId = 0x00000057, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(368), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(370), \
       .attributeCount = 5, \
       .clusterSize = 18, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4172,7 +4181,7 @@
   { \
       /* Endpoint: 1, Cluster: Dishwasher Mode (server) */ \
       .clusterId = 0x00000059, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(373), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(375), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4185,7 +4194,7 @@
   { \
       /* Endpoint: 1, Cluster: Air Quality (server) */ \
       .clusterId = 0x0000005B, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(377), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(379), \
       .attributeCount = 3, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4198,9 +4207,9 @@
   { \
       /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */ \
       .clusterId = 0x0000005C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(380), \
-      .attributeCount = 15, \
-      .clusterSize = 22, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(382), \
+      .attributeCount = 16, \
+      .clusterSize = 23, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 153 ), \
@@ -4211,7 +4220,7 @@
   { \
       /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */ \
       .clusterId = 0x0000005D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(395), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(398), \
       .attributeCount = 6, \
       .clusterSize = 22, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4224,7 +4233,7 @@
   { \
       /* Endpoint: 1, Cluster: Microwave Oven Mode (server) */ \
       .clusterId = 0x0000005E, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(401), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(404), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4237,7 +4246,7 @@
   { \
       /* Endpoint: 1, Cluster: Operational State (server) */ \
       .clusterId = 0x00000060, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(405), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(408), \
       .attributeCount = 8, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4250,7 +4259,7 @@
   { \
       /* Endpoint: 1, Cluster: RVC Operational State (server) */ \
       .clusterId = 0x00000061, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(413), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(416), \
       .attributeCount = 8, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4263,7 +4272,7 @@
   { \
       /* Endpoint: 1, Cluster: Scenes Management (server) */ \
       .clusterId = 0x00000062, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(421), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(424), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4276,7 +4285,7 @@
   { \
       /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */ \
       .clusterId = 0x00000071, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(425), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(428), \
       .attributeCount = 8, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4289,7 +4298,7 @@
   { \
       /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */ \
       .clusterId = 0x00000072, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(433), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(436), \
       .attributeCount = 8, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4302,7 +4311,7 @@
   { \
       /* Endpoint: 1, Cluster: Boolean State Configuration (server) */ \
       .clusterId = 0x00000080, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(441), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(444), \
       .attributeCount = 10, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4315,7 +4324,7 @@
   { \
       /* Endpoint: 1, Cluster: Valve Configuration and Control (server) */ \
       .clusterId = 0x00000081, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(451), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(454), \
       .attributeCount = 13, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4328,7 +4337,7 @@
   { \
       /* Endpoint: 1, Cluster: Electrical Power Measurement (server) */ \
       .clusterId = 0x00000090, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(464), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(467), \
       .attributeCount = 21, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4341,7 +4350,7 @@
   { \
       /* Endpoint: 1, Cluster: Electrical Energy Measurement (server) */ \
       .clusterId = 0x00000091, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(485), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(488), \
       .attributeCount = 8, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4354,7 +4363,7 @@
   { \
       /* Endpoint: 1, Cluster: Device Energy Management (server) */ \
       .clusterId = 0x00000098, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(493), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(496), \
       .attributeCount = 10, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4367,7 +4376,7 @@
   { \
       /* Endpoint: 1, Cluster: Energy EVSE (server) */ \
       .clusterId = 0x00000099, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(503), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(506), \
       .attributeCount = 19, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4380,7 +4389,7 @@
   { \
       /* Endpoint: 1, Cluster: Energy Preference (server) */ \
       .clusterId = 0x0000009B, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(522), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(525), \
       .attributeCount = 7, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4393,7 +4402,7 @@
   { \
       /* Endpoint: 1, Cluster: Power Topology (server) */ \
       .clusterId = 0x0000009C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(529), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(532), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4406,7 +4415,7 @@
   { \
       /* Endpoint: 1, Cluster: Energy EVSE Mode (server) */ \
       .clusterId = 0x0000009D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(533), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(536), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4419,7 +4428,7 @@
   { \
       /* Endpoint: 1, Cluster: Device Energy Management Mode (server) */ \
       .clusterId = 0x0000009F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(537), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(540), \
       .attributeCount = 4, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4432,7 +4441,7 @@
   { \
       /* Endpoint: 1, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(541), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(544), \
       .attributeCount = 24, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4445,7 +4454,7 @@
   { \
       /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \
       .clusterId = 0x00000200, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(565), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(568), \
       .attributeCount = 25, \
       .clusterSize = 52, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4458,7 +4467,7 @@
   { \
       /* Endpoint: 1, Cluster: Thermostat (server) */ \
       .clusterId = 0x00000201, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(590), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(593), \
       .attributeCount = 26, \
       .clusterSize = 70, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4471,7 +4480,7 @@
   { \
       /* Endpoint: 1, Cluster: Fan Control (server) */ \
       .clusterId = 0x00000202, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(616), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(619), \
       .attributeCount = 14, \
       .clusterSize = 18, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4484,7 +4493,7 @@
   { \
       /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
       .clusterId = 0x00000204, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(630), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(633), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4497,7 +4506,7 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(635), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(638), \
       .attributeCount = 54, \
       .clusterSize = 345, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -4510,7 +4519,7 @@
   { \
       /* Endpoint: 1, Cluster: Ballast Configuration (server) */ \
       .clusterId = 0x00000301, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(689), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(692), \
       .attributeCount = 16, \
       .clusterSize = 58, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4523,7 +4532,7 @@
   { \
       /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \
       .clusterId = 0x00000400, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(705), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(708), \
       .attributeCount = 7, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4536,9 +4545,9 @@
   { \
       /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(712), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(715), \
       .attributeCount = 6, \
-      .clusterSize = 14, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr, \
@@ -4549,7 +4558,7 @@
   { \
       /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
       .clusterId = 0x00000403, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(718), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(721), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4562,7 +4571,7 @@
   { \
       /* Endpoint: 1, Cluster: Flow Measurement (server) */ \
       .clusterId = 0x00000404, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(723), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(726), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4575,7 +4584,7 @@
   { \
       /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(729), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(732), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4588,7 +4597,7 @@
   { \
       /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(735), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(738), \
       .attributeCount = 5, \
       .clusterSize = 3, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4601,7 +4610,7 @@
   { \
       /* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */ \
       .clusterId = 0x0000040C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(740), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(743), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4614,7 +4623,7 @@
   { \
       /* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */ \
       .clusterId = 0x0000040D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(753), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(756), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4627,7 +4636,7 @@
   { \
       /* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */ \
       .clusterId = 0x00000413, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(766), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(769), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4640,7 +4649,7 @@
   { \
       /* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */ \
       .clusterId = 0x00000415, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(779), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(782), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4653,7 +4662,7 @@
   { \
       /* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */ \
       .clusterId = 0x0000042A, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(792), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(795), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4666,7 +4675,7 @@
   { \
       /* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */ \
       .clusterId = 0x0000042B, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(805), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(808), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4679,7 +4688,7 @@
   { \
       /* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */ \
       .clusterId = 0x0000042C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(818), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(821), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4692,7 +4701,7 @@
   { \
       /* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */ \
       .clusterId = 0x0000042D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(831), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(834), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4705,7 +4714,7 @@
   { \
       /* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */ \
       .clusterId = 0x0000042E, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(844), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(847), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4718,7 +4727,7 @@
   { \
       /* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */ \
       .clusterId = 0x0000042F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(857), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(860), \
       .attributeCount = 13, \
       .clusterSize = 2, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4731,7 +4740,7 @@
   { \
       /* Endpoint: 1, Cluster: Wake on LAN (server) */ \
       .clusterId = 0x00000503, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(870), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(873), \
       .attributeCount = 3, \
       .clusterSize = 19, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4744,7 +4753,7 @@
   { \
       /* Endpoint: 1, Cluster: Low Power (server) */ \
       .clusterId = 0x00000508, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(873), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(876), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4757,7 +4766,7 @@
   { \
       /* Endpoint: 1, Cluster: Chime (server) */ \
       .clusterId = 0x00000556, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(875), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(878), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4770,7 +4779,7 @@
   { \
       /* Endpoint: 1, Cluster: TLS Certificate Management (server) */ \
       .clusterId = 0x00000801, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(880), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(883), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4783,7 +4792,7 @@
   { \
       /* Endpoint: 1, Cluster: TLS Client Management (server) */ \
       .clusterId = 0x00000802, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(886), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(889), \
       .attributeCount = 4, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4796,7 +4805,7 @@
   { \
       /* Endpoint: 1, Cluster: Unit Testing (server) */ \
       .clusterId = 0xFFF1FC05, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(890), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(893), \
       .attributeCount = 84, \
       .clusterSize = 2290, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4809,7 +4818,7 @@
   { \
       /* Endpoint: 2, Cluster: Identify (server) */ \
       .clusterId = 0x00000003, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(974), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(977), \
       .attributeCount = 4, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4822,7 +4831,7 @@
   { \
       /* Endpoint: 2, Cluster: Groups (server) */ \
       .clusterId = 0x00000004, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(978), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(981), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4835,7 +4844,7 @@
   { \
       /* Endpoint: 2, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(981), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(984), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -4848,7 +4857,7 @@
   { \
       /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(988), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(991), \
       .attributeCount = 7, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4861,7 +4870,7 @@
   { \
       /* Endpoint: 2, Cluster: Power Source (server) */ \
       .clusterId = 0x0000002F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(995), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(998), \
       .attributeCount = 9, \
       .clusterSize = 70, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4874,7 +4883,7 @@
   { \
       /* Endpoint: 2, Cluster: Scenes Management (server) */ \
       .clusterId = 0x00000062, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(1004), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(1007), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4887,7 +4896,7 @@
   { \
       /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(1008), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(1011), \
       .attributeCount = 5, \
       .clusterSize = 3, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4900,7 +4909,7 @@
   { \
       /* Endpoint: 65534, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(1013), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(1016), \
       .attributeCount = 6, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4913,7 +4922,7 @@
   { \
       /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \
       .clusterId = 0x00000031, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(1019), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(1022), \
       .attributeCount = 10, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4933,7 +4942,7 @@
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
         { ZAP_CLUSTER_INDEX(0), 28, 185 },                                                                                         \
-        { ZAP_CLUSTER_INDEX(28), 73, 3371 },                                                                                       \
+        { ZAP_CLUSTER_INDEX(28), 73, 3364 },                                                                                       \
         { ZAP_CLUSTER_INDEX(101), 7, 99 },                                                                                         \
         { ZAP_CLUSTER_INDEX(108), 2, 0 },                                                                                          \
     }
@@ -4947,7 +4956,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (0)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (3655)
+#define ATTRIBUTE_MAX_SIZE (3648)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (4)
@@ -4961,8 +4970,8 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
-    { { 0x00000011, 1 }, { 0x00000016, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 },                                                  \
-      { 0x00000100, 1 }, { 0x00000011, 1 }, { 0x00000019, 1 } }
+    { { 0x00000011, 1 }, { 0x00000016, 5 }, { 0x00000100, 4 }, { 0x00000011, 1 },                                                  \
+      { 0x00000100, 4 }, { 0x00000011, 1 }, { 0x00000019, 1 } }
 
 // Array of device type offsets
 #define FIXED_DEVICE_TYPE_OFFSETS { 0, 2, 4, 6 }
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
index a35de452c91..ff3e5bfa2ee 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
@@ -38,7 +38,7 @@
     0x00000031, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    0x0000003F, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
@@ -53,7 +53,7 @@
     0x00000006, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     0x00000007, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0x00000000, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    0x00000004, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
@@ -68,7 +68,7 @@
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
@@ -90,6 +90,7 @@
     0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0x0000003F, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     0x00000041, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     0x00000300, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
@@ -110,6 +111,7 @@
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0x00000004, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     0x00000000, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     0x00004010, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
@@ -130,6 +132,7 @@
     chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     chip::Access::Privilege::kManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Attribute: GroupcastAdoption, Privilege: administer */ \
     chip::Access::Privilege::kManage, /* Cluster: User Label, Attribute: LabelList, Privilege: manage */ \
     chip::Access::Privilege::kManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index 4a2ce114275..6e8dbc0be0d 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -70,7 +70,7 @@
     }
 
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 275
+#define GENERATED_ATTRIBUTE_COUNT 277
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -251,6 +251,8 @@
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ActiveNetworkFaults */                         \
         { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                                   \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TestEventTriggersEnabled */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DeviceLoadStatus */                            \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32),                                                                  \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */                                  \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
@@ -520,6 +522,9 @@
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupsPerFabric */                          \
         { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupKeysPerFabric */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupcastAdoption */                                                              \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32),                                                                  \
           ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */                                  \
         { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
@@ -1046,7 +1051,7 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033, \
       .attributes = ZAP_ATTRIBUTE_INDEX(70), \
-      .attributeCount = 11, \
+      .attributeCount = 12, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
@@ -1058,7 +1063,7 @@
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
       .attributeCount = 6, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1071,7 +1076,7 @@
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(87), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
       .attributeCount = 65, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1084,7 +1089,7 @@
   { \
       /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */ \
       .clusterId = 0x00000036, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1097,7 +1102,7 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
       .attributeCount = 11, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1110,7 +1115,7 @@
   { \
       /* Endpoint: 0, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 4, \
       .clusterSize = 5, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1123,7 +1128,7 @@
   { \
       /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \
       .clusterId = 0x0000003C, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
       .attributeCount = 5, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1136,7 +1141,7 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(188), \
       .attributeCount = 8, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1149,8 +1154,8 @@
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
-      .attributeCount = 6, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(196), \
+      .attributeCount = 7, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
@@ -1162,7 +1167,7 @@
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(203), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1175,7 +1180,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
       .attributeCount = 3, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1188,7 +1193,7 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(209), \
       .attributeCount = 4, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1201,7 +1206,7 @@
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1214,7 +1219,7 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(216), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -1227,7 +1232,7 @@
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(221), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -1240,7 +1245,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(239), \
       .attributeCount = 6, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1253,7 +1258,7 @@
   { \
       /* Endpoint: 1, Cluster: Scenes Management (server) */ \
       .clusterId = 0x00000062, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1266,7 +1271,7 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(249), \
       .attributeCount = 23, \
       .clusterSize = 40, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -1279,7 +1284,7 @@
   { \
       /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406, \
-      .attributes = ZAP_ATTRIBUTE_INDEX(270), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 5, \
       .clusterSize = 3, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1324,7 +1329,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define FIXED_PROFILE_IDS { 0x0103, 0x0103 }
 
 // Array of device types
-#define FIXED_DEVICE_TYPES { { 0x00000016, 1 }, { 0x00000101, 1 } }
+#define FIXED_DEVICE_TYPES { { 0x00000016, 5 }, { 0x00000101, 1 } }
 
 // Array of device type offsets
 #define FIXED_DEVICE_TYPE_OFFSETS { 0, 1 }
diff --git a/src/BUILD.gn b/src/BUILD.gn
index 5b233b9e911..fffa3531456 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -59,6 +59,7 @@ if (chip_build_tests) {
       "${chip_root}/src/app/clusters/bindings/tests",
       "${chip_root}/src/app/clusters/boolean-state-configuration-server/tests",
       "${chip_root}/src/app/clusters/boolean-state-server/tests",
+      "${chip_root}/src/app/clusters/bridged-device-basic-information-server/tests",
       "${chip_root}/src/app/clusters/camera-av-stream-management-server/tests",
       "${chip_root}/src/app/clusters/camera-av-settings-user-level-management-server/tests",
       "${chip_root}/src/app/clusters/chime-server/tests",
@@ -92,6 +93,7 @@ if (chip_build_tests) {
       "${chip_root}/src/app/clusters/software-diagnostics-server/tests",
       "${chip_root}/src/app/clusters/soil-measurement-server/tests",
       "${chip_root}/src/app/clusters/switch-server/tests",
+      "${chip_root}/src/app/clusters/temperature-measurement-server/tests",
       "${chip_root}/src/app/clusters/thread-network-diagnostics-server/tests",
       "${chip_root}/src/app/clusters/time-format-localization-server/tests",
       "${chip_root}/src/app/clusters/time-synchronization-server/tests",
@@ -103,6 +105,7 @@ if (chip_build_tests) {
       "${chip_root}/src/app/clusters/webrtc-transport-provider-server/tests",
       "${chip_root}/src/app/clusters/webrtc-transport-requestor-server/tests",
       "${chip_root}/src/app/clusters/wifi-network-diagnostics-server/tests",
+      "${chip_root}/src/app/clusters/wifi-network-management-server/tests",
       "${chip_root}/src/app/clusters/zone-management-server/tests",
       "${chip_root}/src/app/data-model-provider/tests",
       "${chip_root}/src/app/data-model/tests",
@@ -146,6 +149,14 @@ if (chip_build_tests) {
       tests += [ "${chip_root}/src/lib/dnssd/minimal_mdns/records/tests" ]
     }
 
+    if (chip_device_platform == "darwin") {
+      # Darwin does not include the uriparser submodule, which is required by
+      # push-av-stream-transport-server tests.
+      tests -= [
+        "${chip_root}/src/app/clusters/push-av-stream-transport-server/tests",
+      ]
+    }
+
     if (current_os != "zephyr") {
       # Avoid these items from "one single binary" test executions. Once tests
       # are split, we can re-visit this (and likely many others).
@@ -233,8 +244,10 @@ if (chip_build_tests) {
     deps = []
     tests = []
 
+    # NXP: EVSE tests depend on ot-simulation; missing headers
+    # in ot-nxp OpenThread cause build failure, so we exclude them here.
     if (chip_device_platform != "esp32" && chip_device_platform != "efr32" &&
-        current_os != "android") {
+        chip_device_platform != "nxp" && current_os != "android") {
       tests += [ "${chip_root}/examples/evse-app/evse-common/tests" ]
     }
   }
diff --git a/src/access/AccessControl.cpp b/src/access/AccessControl.cpp
index dc32390e888..628ece0bb90 100644
--- a/src/access/AccessControl.cpp
+++ b/src/access/AccessControl.cpp
@@ -25,6 +25,8 @@
 
 #include <lib/core/Global.h>
 
+#include <credentials/GroupDataProvider.h>
+
 namespace chip {
 namespace Access {
 
@@ -349,6 +351,20 @@ CHIP_ERROR AccessControl::Check(const SubjectDescriptor & subjectDescriptor, con
     }
 #endif
 
+    if ((CHIP_NO_ERROR != result) && (Access::AuthMode::kGroup == subjectDescriptor.authMode) &&
+        (Access::RequestType::kCommandInvokeRequest == requestPath.requestType) &&
+        (Access::Privilege::kOperate == requestPrivilege))
+    {
+        Credentials::GroupDataProvider * groups = Credentials::GetGroupDataProvider();
+        VerifyOrReturnError(nullptr != groups, result);
+        Credentials::GroupDataProvider::GroupInfo info;
+        GroupId gid = GroupIdFromNodeId(subjectDescriptor.subject);
+        ReturnErrorOnFailure(groups->GetGroupInfo(subjectDescriptor.fabricIndex, gid, info));
+        if (info.HasAuxiliaryACL())
+        {
+            return CHIP_NO_ERROR;
+        }
+    }
     return result;
 }
 
diff --git a/src/access/BUILD.gn b/src/access/BUILD.gn
index 82eca63f428..e5596c20792 100644
--- a/src/access/BUILD.gn
+++ b/src/access/BUILD.gn
@@ -66,6 +66,7 @@ static_library("access") {
   public_deps = [
     ":access_config",
     ":types",
+    "${chip_root}/src/credentials",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:types",
     "${chip_root}/src/lib/support",
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
index f0d770f8857..3493bf4ce33 100644
--- a/src/app/InteractionModelEngine.cpp
+++ b/src/app/InteractionModelEngine.cpp
@@ -240,6 +240,19 @@ void InteractionModelEngine::Shutdown()
 
     mReadHandlers.ReleaseAll();
 
+    // Shut down the data model provider to clear cluster mContext pointers.
+    // Required for proper Stop() → Start() lifecycle - ensures clusters are reinitialized.
+    if (mDataModelProvider != nullptr)
+    {
+        CHIP_ERROR err = mDataModelProvider->Shutdown();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(InteractionModel,
+                         "InteractionModelEngine::Shutdown() Data model provider shutdown failed: %" CHIP_ERROR_FORMAT,
+                         err.Format());
+        }
+    }
+
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
     // Shut down any subscription clients that are still around.  They won't be
     // able to work after this point anyway, since we're about to drop our refs
@@ -1916,14 +1929,20 @@ DataModel::Provider * InteractionModelEngine::SetDataModelProvider(DataModel::Pr
     // Altering data model should not be done while IM is actively handling requests.
     VerifyOrDie(mReadHandlers.begin() == mReadHandlers.end());
 
+    // REMOVED: Early return when (model == mDataModelProvider) - breaks Stop() → Start()
+    // After Shutdown(), server clusters are uninitialized even though pointer is unchanged.
+    // Must call Startup() again to reinitialize cluster mContext pointers.
+
     if (model == mDataModelProvider)
     {
-        // no-op, just return
-        return model;
+        ChipLogDetail(DataManagement,
+                      "InteractionModelEngine::SetDataModelProvider() re-initializing same provider (Stop/Start cycle)");
     }
 
     DataModel::Provider * oldModel = mDataModelProvider;
-    if (oldModel != nullptr)
+
+    // Only shutdown if changing to a different provider
+    if (oldModel != nullptr && oldModel != model)
     {
         CHIP_ERROR err = oldModel->Shutdown();
         if (err != CHIP_NO_ERROR)
diff --git a/src/app/SpecificationDefinedRevisions.h b/src/app/SpecificationDefinedRevisions.h
index 9abdcd1e1df..a4817836236 100644
--- a/src/app/SpecificationDefinedRevisions.h
+++ b/src/app/SpecificationDefinedRevisions.h
@@ -50,7 +50,7 @@ inline constexpr uint16_t kDataModelRevision = 19;
  * See section 11.1.5.22. "SpecificationVersion Attribute" in "Service and
  * Device Management" chapter of the core Matter specification.
  */
-inline constexpr uint32_t kSpecificationVersion = 0x01050100;
+inline constexpr uint32_t kSpecificationVersion = 0x01060000;
 
 } // namespace Revision
 } // namespace chip
diff --git a/src/app/clusters/BUILD.gn b/src/app/clusters/BUILD.gn
new file mode 100644
index 00000000000..bd7616a6c5f
--- /dev/null
+++ b/src/app/clusters/BUILD.gn
@@ -0,0 +1,78 @@
+# Copyright (c) 2026 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")
+
+source_set("clusters") {
+  public_deps = [
+    # keep-sorted: start
+    "access-control-server",
+    "administrator-commissioning-server",
+    "basic-information",
+    "boolean-state-configuration-server",
+    "boolean-state-server",
+    "bridged-device-basic-information-server",
+    "camera-av-settings-user-level-management-server",
+    "chime-server",
+    "descriptor",
+    "general-commissioning-server",
+    "general-diagnostics-server",
+    "group-key-mgmt-server",
+    "groupcast",
+    "groups-server",
+    "identify-server",
+    "illuminance-measurement-server",
+    "level-control",
+    "network-commissioning",
+    "occupancy-sensor-server",
+    "on-off-server",
+    "operational-credentials-server",
+    "push-av-stream-transport-server",
+    "scenes-server",
+    "software-diagnostics-server",
+    "temperature-measurement-server",
+    "tls-certificate-management-server",
+    "tls-client-management-server",
+    "webrtc-transport-provider-server",
+    "wifi-network-diagnostics-server",
+
+    # keep-sorted: end
+  ]
+
+  if (chip_device_platform == "ameba") {
+    # Ameba/Realtek overrides various things in c-headers that are C++ standard items. Generally
+    # these get pulled via LWIP and end up overriding things like true/false/isalpha by macros.
+    #
+    # This results in errors in libraries used by these clusters, like:
+    #
+    # INFO    In file included from /opt/ameba/ambd_sdk_with_chip_non_NDA/component/common/api/platform/platform_stdlib_rtl8721d.h:25,
+    # INFO                     from /opt/ameba/ambd_sdk_with_chip_non_NDA/component/common/api/platform/platform_stdlib.h:39,
+    # INFO                     from /opt/ameba/ambd_sdk_with_chip_non_NDA/component/common/api/network/include/lwipopts.h:17,
+    # INFO                     from /opt/ameba/ambd_sdk_with_chip_non_NDA/component/common/network/lwip/lwip_v2.1.2/src/include/lwip/opt.h:51,
+    # INFO                     from /opt/ameba/ambd_sdk_with_chip_non_NDA/component/common/network/lwip/lwip_v2.1.2/src/include/lwip/errno.h:40,
+    # INFO                     from ../../../config/ameba/third_party/connectedhomeip/third_party/uriparser/repo/src/UriMemory.c:56:
+    # INFO    /__w/connectedhomeip/connectedhomeip/.environment/cipd/packages/arm/arm-none-eabi/include/ctype.h:14:5: error: expected identifier or '(' before 'int'
+    # INFO       14 | int isalpha (int __c);
+    # INFO          |     ^~~~~~~
+    # INFO    /opt/ameba/ambd_sdk_with_chip_non_NDA/component/soc/realtek/amebad/swlib/string/strproc.h:26:30: error: expected ')' before '>=' token
+    # INFO       26 | #define isupper(c)      (((c)>='A')&&((c)<='Z'))
+    public_deps -= [ "push-av-stream-transport-server" ]
+  }
+
+  if (chip_device_platform == "darwin") {
+    # Darwin does not include the uriparser submodule, which is required by
+    # push-av-stream-transport-server.
+    public_deps -= [ "push-av-stream-transport-server" ]
+  }
+}
diff --git a/src/app/clusters/access-control-server/app_config_dependent_sources.cmake b/src/app/clusters/access-control-server/app_config_dependent_sources.cmake
index b0677ddb52a..6981c76119a 100644
--- a/src/app/clusters/access-control-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/access-control-server/app_config_dependent_sources.cmake
@@ -19,12 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/ArlEncoder.cpp"
-    "${CLUSTER_DIR}/ArlEncoder.h"
-    "${CLUSTER_DIR}/access-control-cluster.h"
-    "${CLUSTER_DIR}/access-control-cluster.cpp"
-)
\ No newline at end of file
diff --git a/src/app/clusters/actions-server/actions-server.cpp b/src/app/clusters/actions-server/ActionsCluster.cpp
similarity index 100%
rename from src/app/clusters/actions-server/actions-server.cpp
rename to src/app/clusters/actions-server/ActionsCluster.cpp
diff --git a/src/app/clusters/actions-server/app_config_dependent_sources.cmake b/src/app/clusters/actions-server/app_config_dependent_sources.cmake
index 48aaf19be36..a1fa831a574 100644
--- a/src/app/clusters/actions-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/actions-server/app_config_dependent_sources.cmake
@@ -16,5 +16,6 @@
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
-    "${CLUSTER_DIR}/actions-server.cpp"
+    "${CLUSTER_DIR}/actions-server.h"
+    "${CLUSTER_DIR}/ActionsCluster.cpp"
 )
\ No newline at end of file
diff --git a/src/app/clusters/actions-server/app_config_dependent_sources.gni b/src/app/clusters/actions-server/app_config_dependent_sources.gni
index de73e72a179..7ef1c16f84e 100644
--- a/src/app/clusters/actions-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/actions-server/app_config_dependent_sources.gni
@@ -11,4 +11,7 @@
 # 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.
-app_config_dependent_sources = [ "actions-server.cpp" ]
+app_config_dependent_sources = [
+  "ActionsCluster.cpp",
+  "actions-server.h",
+]
diff --git a/src/app/clusters/administrator-commissioning-server/app_config_dependent_sources.cmake b/src/app/clusters/administrator-commissioning-server/app_config_dependent_sources.cmake
index 29814f3eac0..6981c76119a 100644
--- a/src/app/clusters/administrator-commissioning-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/administrator-commissioning-server/app_config_dependent_sources.cmake
@@ -19,12 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/AdministratorCommissioningCluster.cpp"
-    "${CLUSTER_DIR}/AdministratorCommissioningCluster.h"
-    "${CLUSTER_DIR}/AdministratorCommissioningLogic.cpp"
-    "${CLUSTER_DIR}/AdministratorCommissioningLogic.h"
-)
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 bcdac7cca7d..c8149a4491d 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-delegate.h
+++ b/src/app/clusters/application-launcher-server/application-launcher-delegate.h
@@ -51,7 +51,7 @@ class Delegate
     }
 
     // this attribute should only be enabled for app platform instance (endpoint 1)
-    CHIP_ERROR HandleGetCurrentApp(app::AttributeValueEncoder & aEncoder);
+    virtual CHIP_ERROR HandleGetCurrentApp(app::AttributeValueEncoder & aEncoder);
 
     virtual CHIP_ERROR HandleGetCatalogList(app::AttributeValueEncoder & aEncoder) = 0;
 
diff --git a/src/app/clusters/basic-information/BasicInformationCluster.cpp b/src/app/clusters/basic-information/BasicInformationCluster.cpp
index 90e192e2206..b0d444011d9 100644
--- a/src/app/clusters/basic-information/BasicInformationCluster.cpp
+++ b/src/app/clusters/basic-information/BasicInformationCluster.cpp
@@ -16,7 +16,7 @@
  */
 #include <app/clusters/basic-information/BasicInformationCluster.h>
 
-#include <app/InteractionModelEngine.h>
+#include <app/SpecificationDefinedRevisions.h>
 #include <app/persistence/AttributePersistence.h>
 #include <app/persistence/AttributePersistenceProvider.h>
 #include <app/persistence/PascalString.h>
@@ -213,7 +213,8 @@ inline CHIP_ERROR ReadUniqueID(DeviceLayer::ConfigurationManager & configManager
     return EncodeStringOnSuccess(status, aEncoder, uniqueId, kMaxLen);
 }
 
-inline CHIP_ERROR ReadCapabilityMinima(AttributeValueEncoder & aEncoder, DeviceInstanceInfoProvider & deviceInfoProvider)
+inline CHIP_ERROR ReadCapabilityMinima(AttributeValueEncoder & aEncoder, DeviceInstanceInfoProvider & deviceInfoProvider,
+                                       uint16_t & subscriptionsPerFabric)
 {
     BasicInformation::Structs::CapabilityMinimaStruct::Type capabilityMinima;
 
@@ -223,7 +224,7 @@ inline CHIP_ERROR ReadCapabilityMinima(AttributeValueEncoder & aEncoder, DeviceI
     auto capabilityMinimasFromDeviceInfo = deviceInfoProvider.GetSupportedCapabilityMinimaValues();
 
     capabilityMinima.caseSessionsPerFabric  = kMinCaseSessionsPerFabricMandatedBySpec;
-    capabilityMinima.subscriptionsPerFabric = InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric();
+    capabilityMinima.subscriptionsPerFabric = subscriptionsPerFabric;
     capabilityMinima.simultaneousInvocationsSupported =
         chip::MakeOptional<uint16_t>(capabilityMinimasFromDeviceInfo.simultaneousInvocationsSupported);
     capabilityMinima.simultaneousWritesSupported =
@@ -355,7 +356,7 @@ DataModel::ActionReturnStatus BasicInformationCluster::ReadAttribute(const DataM
     case UniqueID::Id:
         return ReadUniqueID(configManager, encoder);
     case CapabilityMinima::Id:
-        return ReadCapabilityMinima(encoder, deviceInfoProvider);
+        return ReadCapabilityMinima(encoder, deviceInfoProvider, mClusterContext.subscriptionsPerFabric);
     case ProductAppearance::Id:
         return ReadProductAppearance(deviceInfoProvider, encoder);
     case SpecificationVersion::Id:
@@ -379,6 +380,15 @@ DataModel::ActionReturnStatus BasicInformationCluster::WriteAttribute(const Data
     return NotifyAttributeChangedIfSuccess(request.path.mAttributeId, WriteImpl(request, decoder));
 }
 
+CHIP_ERROR BasicInformationCluster::IncreaseConfigurationVersion()
+{
+    uint32_t globalConfig = 0;
+    ReturnErrorOnFailure(mClusterContext.configurationManager.GetConfigurationVersion(globalConfig));
+    ReturnErrorOnFailure(mClusterContext.configurationManager.StoreConfigurationVersion(globalConfig + 1));
+    NotifyAttributeChanged(ConfigurationVersion::Id);
+    return CHIP_NO_ERROR;
+}
+
 DataModel::ActionReturnStatus BasicInformationCluster::WriteImpl(const DataModel::WriteAttributeRequest & request,
                                                                  AttributeValueDecoder & decoder)
 {
diff --git a/src/app/clusters/basic-information/BasicInformationCluster.h b/src/app/clusters/basic-information/BasicInformationCluster.h
index a8dc61f0c8d..25a7a40548d 100644
--- a/src/app/clusters/basic-information/BasicInformationCluster.h
+++ b/src/app/clusters/basic-information/BasicInformationCluster.h
@@ -44,6 +44,7 @@ class BasicInformationCluster : public DefaultServerCluster, public DeviceLayer:
         DeviceLayer::DeviceInstanceInfoProvider & deviceInstanceInfoProvider;
         DeviceLayer::ConfigurationManager & configurationManager;
         DeviceLayer::PlatformManager & platformManager;
+        uint16_t subscriptionsPerFabric;
     };
 
     using OptionalAttributesSet = chip::app::OptionalAttributeSet< //
@@ -95,6 +96,12 @@ class BasicInformationCluster : public DefaultServerCluster, public DeviceLayer:
 
     void OnShutDown() override;
 
+    // ConfigurationVersionDelegate, however NOT overridable to save
+    // some flash in case this feature is never used. This means applications that may
+    // change configurations at runtime pay a bit more flash, however those are probably more
+    // dynamic (i.e. larger) systems like bridges or more complex systems.
+    CHIP_ERROR IncreaseConfigurationVersion();
+
 private:
     // write without notification
     DataModel::ActionReturnStatus WriteImpl(const DataModel::WriteAttributeRequest & request, AttributeValueDecoder & decoder);
diff --git a/src/app/clusters/basic-information/CodegenIntegration.cpp b/src/app/clusters/basic-information/CodegenIntegration.cpp
index 024d62b6a70..5aa7a058e1e 100644
--- a/src/app/clusters/basic-information/CodegenIntegration.cpp
+++ b/src/app/clusters/basic-information/CodegenIntegration.cpp
@@ -15,6 +15,7 @@
  *    limitations under the License.
  */
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/InteractionModelEngine.h>
 #include <app/clusters/basic-information/BasicInformationCluster.h>
 #include <app/static-cluster-config/BasicInformation.h>
 #include <app/util/attribute-storage.h>
@@ -62,9 +63,12 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
         DeviceLayer::DeviceInstanceInfoProvider * provider = DeviceLayer::GetDeviceInstanceInfoProvider();
         VerifyOrDie(provider != nullptr);
 
-        BasicInformationCluster::Context context = { .deviceInstanceInfoProvider = *provider,
-                                                     .configurationManager       = DeviceLayer::ConfigurationMgr(),
-                                                     .platformManager            = DeviceLayer::PlatformMgr() };
+        BasicInformationCluster::Context context = {
+            .deviceInstanceInfoProvider = *provider,
+            .configurationManager       = DeviceLayer::ConfigurationMgr(),
+            .platformManager            = DeviceLayer::PlatformMgr(),
+            .subscriptionsPerFabric     = InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric()
+        };
         gServer.Create(optionalAttributeSet, context);
 
         // This disabling of the unique id attribute is here only for test purposes. The uniqe id attribute
@@ -90,6 +94,16 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
 
 } // namespace
 
+namespace chip::app::Clusters::BasicInformation {
+
+BasicInformationCluster * GetClusterInstance()
+{
+    VerifyOrReturnValue(gServer.IsConstructed(), nullptr);
+    return &gServer.Cluster();
+}
+
+} // namespace chip::app::Clusters::BasicInformation
+
 void MatterBasicInformationClusterInitCallback(EndpointId endpointId)
 {
     VerifyOrReturn(endpointId == kRootEndpointId);
diff --git a/src/app/clusters/basic-information/CodegenIntegration.h b/src/app/clusters/basic-information/CodegenIntegration.h
new file mode 100644
index 00000000000..32cde2f0960
--- /dev/null
+++ b/src/app/clusters/basic-information/CodegenIntegration.h
@@ -0,0 +1,26 @@
+/*
+ *    Copyright (c) 2026 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 <app/clusters/basic-information/BasicInformationCluster.h>
+
+namespace chip::app::Clusters::BasicInformation {
+
+BasicInformationCluster * GetClusterInstance();
+
+} // namespace chip::app::Clusters::BasicInformation
diff --git a/src/app/clusters/basic-information/app_config_dependent_sources.cmake b/src/app/clusters/basic-information/app_config_dependent_sources.cmake
index 1481bf30af0..5ae3e0f1497 100644
--- a/src/app/clusters/basic-information/app_config_dependent_sources.cmake
+++ b/src/app/clusters/basic-information/app_config_dependent_sources.cmake
@@ -17,12 +17,6 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.h"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/BasicInformationCluster.cpp"
-    "${CLUSTER_DIR}/BasicInformationCluster.h"
-)
diff --git a/src/app/clusters/basic-information/app_config_dependent_sources.gni b/src/app/clusters/basic-information/app_config_dependent_sources.gni
index 2c3232e2a4b..be7224f0bbc 100644
--- a/src/app/clusters/basic-information/app_config_dependent_sources.gni
+++ b/src/app/clusters/basic-information/app_config_dependent_sources.gni
@@ -11,4 +11,7 @@
 # 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.
-app_config_dependent_sources = [ "CodegenIntegration.cpp" ]
+app_config_dependent_sources = [
+  "CodegenIntegration.cpp",
+  "CodegenIntegration.h",
+]
diff --git a/src/app/clusters/basic-information/tests/TestBasicInformationCluster.cpp b/src/app/clusters/basic-information/tests/TestBasicInformationCluster.cpp
index 98731e18fdc..60e3d93bf7e 100644
--- a/src/app/clusters/basic-information/tests/TestBasicInformationCluster.cpp
+++ b/src/app/clusters/basic-information/tests/TestBasicInformationCluster.cpp
@@ -15,6 +15,7 @@
  */
 #include <pw_unit_test/framework.h>
 
+#include <app/InteractionModelEngine.h>
 #include <app/clusters/basic-information/BasicInformationCluster.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/server-cluster/DefaultServerCluster.h>
@@ -132,9 +133,12 @@ class MockDeviceInstanceInfoProvider : public DeviceLayer::DeviceInstanceInfoPro
 struct TestBasicInformationCluster : public ::testing::Test
 {
     MockDeviceInstanceInfoProvider mDeviceInfoProvider;
-    BasicInformationCluster::Context mContext = { .deviceInstanceInfoProvider = mDeviceInfoProvider,
-                                                  .configurationManager       = chip::DeviceLayer::ConfigurationMgr(),
-                                                  .platformManager            = chip::DeviceLayer::PlatformMgr() };
+    BasicInformationCluster::Context mContext = {
+        .deviceInstanceInfoProvider = mDeviceInfoProvider,
+        .configurationManager       = chip::DeviceLayer::ConfigurationMgr(),
+        .platformManager            = chip::DeviceLayer::PlatformMgr(),
+        .subscriptionsPerFabric     = app::InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric(),
+    };
 
     static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
     static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
diff --git a/src/app/clusters/basic-information/tests/TestBasicInformationReadWrite.cpp b/src/app/clusters/basic-information/tests/TestBasicInformationReadWrite.cpp
index d53ce31a138..3d06cd5b834 100644
--- a/src/app/clusters/basic-information/tests/TestBasicInformationReadWrite.cpp
+++ b/src/app/clusters/basic-information/tests/TestBasicInformationReadWrite.cpp
@@ -14,6 +14,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <app/InteractionModelEngine.h>
 #include <app/clusters/basic-information/BasicInformationCluster.h>
 #include <app/persistence/AttributePersistence.h>
 #include <app/server-cluster/testing/AttributeTesting.h>
@@ -304,6 +305,7 @@ struct TestBasicInformationReadWrite : public ::testing::Test
         .deviceInstanceInfoProvider = mDeviceInfoProvider,
         .configurationManager       = mMockConfigurationManager,
         .platformManager            = chip::DeviceLayer::PlatformMgr(),
+        .subscriptionsPerFabric     = InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric(),
     };
 };
 
diff --git a/src/app/clusters/bindings/BindingCluster.cpp b/src/app/clusters/bindings/BindingCluster.cpp
index 50f6a5e43ce..31d6ea0b1d5 100644
--- a/src/app/clusters/bindings/BindingCluster.cpp
+++ b/src/app/clusters/bindings/BindingCluster.cpp
@@ -25,21 +25,18 @@
 #include <app/clusters/bindings/BindingCluster.h>
 #include <app/clusters/bindings/binding-table.h>
 #include <app/server-cluster/AttributeListBuilder.h>
-#include <clusters/Binding/Attributes.h>
 #include <clusters/Binding/Metadata.h>
-#include <clusters/Binding/Structs.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
-using TargetStructType         = Binding::Structs::TargetStruct::Type;
-using DecodableBindingListType = Binding::Attributes::Binding::TypeInfo::DecodableType;
 
-// TODO: add binding table to the persistent storage
-namespace {
+namespace chip {
+namespace app {
+namespace Clusters {
 
-bool IsValidBinding(const EndpointId localEndpoint, const TargetStructType & entry)
+bool BindingCluster::IsValidBinding(const EndpointId localEndpoint, const TargetStructType & entry)
 {
     // Entry has endpoint, node id and no group id
     if (!entry.group.HasValue() && entry.endpoint.HasValue() && entry.node.HasValue())
@@ -48,9 +45,7 @@ bool IsValidBinding(const EndpointId localEndpoint, const TargetStructType & ent
         // Valid node/endpoint/cluster binding
         ReadOnlyBufferBuilder<ClusterId> clientClusters;
         // TODO: is this a correct validation?
-        VerifyOrReturnValue(InteractionModelEngine::GetInstance()->GetDataModelProvider()->ClientClusters(
-                                localEndpoint, clientClusters) == CHIP_NO_ERROR,
-                            false);
+        VerifyOrReturnValue(mContext->provider.ClientClusters(localEndpoint, clientClusters) == CHIP_NO_ERROR, false);
         for (auto & client : clientClusters.TakeBuffer())
         {
             VerifyOrReturnValue(client != entry.cluster.Value(), true);
@@ -60,8 +55,8 @@ bool IsValidBinding(const EndpointId localEndpoint, const TargetStructType & ent
     return (!entry.endpoint.HasValue() && !entry.node.HasValue() && entry.group.HasValue());
 }
 
-CHIP_ERROR CheckValidBindingList(const EndpointId localEndpoint, const DecodableBindingListType & bindingList,
-                                 FabricIndex accessingFabricIndex)
+CHIP_ERROR BindingCluster::CheckValidBindingList(const EndpointId localEndpoint, const DecodableBindingListType & bindingList,
+                                                 FabricIndex accessingFabricIndex)
 {
     size_t listSize = 0;
     auto iter       = bindingList.begin();
@@ -74,41 +69,18 @@ CHIP_ERROR CheckValidBindingList(const EndpointId localEndpoint, const Decodable
 
     // Check binding table size
     uint8_t oldListSize = 0;
-    for (const auto & entry : Binding::Table::GetInstance())
+    for (const auto & entry : mClusterContext.bindingTable)
     {
         if (entry.local == localEndpoint && entry.fabricIndex == accessingFabricIndex)
         {
             oldListSize++;
         }
     }
-    VerifyOrReturnError(Binding::Table::GetInstance().Size() - oldListSize + listSize <= Binding::Table::kMaxBindingEntries,
+    VerifyOrReturnError(mClusterContext.bindingTable.Size() - oldListSize + listSize <= Binding::Table::kMaxBindingEntries,
                         CHIP_IM_GLOBAL_STATUS(ResourceExhausted));
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint)
-{
-    Binding::TableEntry bindingEntry;
-
-    if (entry.group.HasValue())
-    {
-        bindingEntry = Binding::TableEntry(entry.fabricIndex, entry.group.Value(), localEndpoint, entry.cluster.std_optional());
-    }
-    else
-    {
-        bindingEntry = Binding::TableEntry(entry.fabricIndex, entry.node.Value(), localEndpoint, entry.endpoint.Value(),
-                                           entry.cluster.std_optional());
-    }
-
-    return AddBindingEntry(bindingEntry);
-}
-
-} // namespace
-
-namespace chip {
-namespace app {
-namespace Clusters {
-
 DataModel::ActionReturnStatus BindingCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
                                                             AttributeValueEncoder & encoder)
 {
@@ -116,7 +88,7 @@ DataModel::ActionReturnStatus BindingCluster::ReadAttribute(const DataModel::Rea
     {
     case Binding::Attributes::Binding::Id: {
         return encoder.EncodeList([&](const auto & subEncoder) {
-            for (auto & entry : Binding::Table::GetInstance())
+            for (auto & entry : mClusterContext.bindingTable)
             {
                 if (entry.local != request.path.mEndpointId)
                 {
@@ -173,17 +145,17 @@ DataModel::ActionReturnStatus BindingCluster::WriteAttribute(const DataModel::Wr
                 CheckValidBindingList(request.path.mEndpointId, newBindingList, request.GetAccessingFabricIndex()));
 
             // Clear all entries for the current accessing fabric and endpoint
-            auto bindingTableIter = Binding::Table::GetInstance().begin();
-            while (bindingTableIter != Binding::Table::GetInstance().end())
+            auto bindingTableIter = mClusterContext.bindingTable.begin();
+            while (bindingTableIter != mClusterContext.bindingTable.end())
             {
                 if (bindingTableIter->local == request.path.mEndpointId &&
                     bindingTableIter->fabricIndex == request.GetAccessingFabricIndex())
                 {
                     if (bindingTableIter->type == Binding::MATTER_UNICAST_BINDING)
                     {
-                        TEMPORARY_RETURN_IGNORED Binding::Manager::GetInstance().UnicastBindingRemoved(bindingTableIter.GetIndex());
+                        TEMPORARY_RETURN_IGNORED mClusterContext.bindingManager.UnicastBindingRemoved(bindingTableIter.GetIndex());
                     }
-                    ReturnErrorOnFailure(Binding::Table::GetInstance().RemoveAt(bindingTableIter));
+                    ReturnErrorOnFailure(mClusterContext.bindingTable.RemoveAt(bindingTableIter));
                 }
                 else
                 {
@@ -246,7 +218,24 @@ CHIP_ERROR BindingCluster::NotifyBindingsChanged(FabricIndex accessingFabricInde
 {
     DeviceLayer::ChipDeviceEvent event{ .Type            = DeviceLayer::DeviceEventType::kBindingsChangedViaCluster,
                                         .BindingsChanged = { .fabricIndex = accessingFabricIndex } };
-    return chip::DeviceLayer::PlatformMgr().PostEvent(&event);
+    return mClusterContext.platformManager.PostEvent(&event);
+}
+
+CHIP_ERROR BindingCluster::CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint)
+{
+    Binding::TableEntry bindingEntry;
+
+    if (entry.group.HasValue())
+    {
+        bindingEntry = Binding::TableEntry(entry.fabricIndex, entry.group.Value(), localEndpoint, entry.cluster.std_optional());
+    }
+    else
+    {
+        bindingEntry = Binding::TableEntry(entry.fabricIndex, entry.node.Value(), localEndpoint, entry.endpoint.Value(),
+                                           entry.cluster.std_optional());
+    }
+
+    return mClusterContext.bindingManager.AddBindingEntry(bindingEntry);
 }
 
 } // namespace Clusters
diff --git a/src/app/clusters/bindings/BindingCluster.h b/src/app/clusters/bindings/BindingCluster.h
index eeae47a7e11..c0fcc376a54 100644
--- a/src/app/clusters/bindings/BindingCluster.h
+++ b/src/app/clusters/bindings/BindingCluster.h
@@ -19,15 +19,29 @@
 #include <app/clusters/bindings/BindingManager.h>
 #include <app/clusters/bindings/binding-table.h>
 #include <app/server-cluster/DefaultServerCluster.h>
+#include <clusters/Binding/Attributes.h>
+#include <clusters/Binding/Structs.h>
 
 namespace chip {
 namespace app {
 namespace Clusters {
 
+using TargetStructType         = Binding::Structs::TargetStruct::Type;
+using DecodableBindingListType = Binding::Attributes::Binding::TypeInfo::DecodableType;
+
 class BindingCluster : public DefaultServerCluster
 {
 public:
-    constexpr BindingCluster(EndpointId endpointId) : DefaultServerCluster(ConcreteClusterPath::ConstExpr(endpointId, Binding::Id))
+    /// Injected dependencies for this cluster
+    struct Context
+    {
+        Binding::Table & bindingTable;
+        Binding::Manager & bindingManager;
+        DeviceLayer::PlatformManager & platformManager;
+    };
+
+    constexpr BindingCluster(Context && context, EndpointId endpointId) :
+        DefaultServerCluster(ConcreteClusterPath::ConstExpr(endpointId, Binding::Id)), mClusterContext(std::move(context))
     {}
 
     DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
@@ -42,7 +56,25 @@ class BindingCluster : public DefaultServerCluster
     CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
 
 private:
+    bool IsValidBinding(const EndpointId localEndpoint, const TargetStructType & entry);
+
+    CHIP_ERROR CheckValidBindingList(const EndpointId localEndpoint, const DecodableBindingListType & bindingList,
+                                     FabricIndex accessingFabricIndex);
+
     CHIP_ERROR NotifyBindingsChanged(FabricIndex accessingFabricIndex);
+
+    /**
+     * @brief appends a binding to the list of bindings
+     *        This function is to be used when a device wants to add a binding to its own table
+     *        If entry is a unicast binding, BindingManager will be notified and will establish a case session with the peer device
+     *        Entry will be added to the binding table and persisted into storage
+     *        BindingManager will be notified and the binding added callback will be called if it has been set
+     *
+     * @param entry binding to add
+     */
+    CHIP_ERROR CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint);
+
+    Context mClusterContext;
 };
 
 } // namespace Clusters
diff --git a/src/app/clusters/bindings/CodegenIntegration.cpp b/src/app/clusters/bindings/CodegenIntegration.cpp
index 21e0d21987d..87bc717092d 100644
--- a/src/app/clusters/bindings/CodegenIntegration.cpp
+++ b/src/app/clusters/bindings/CodegenIntegration.cpp
@@ -39,7 +39,13 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
     ServerClusterRegistration & CreateRegistration(EndpointId endpointId, unsigned clusterInstanceIndex,
                                                    uint32_t optionalAttributeBits, uint32_t featureMap) override
     {
-        gServers[clusterInstanceIndex].Create(endpointId);
+        gServers[clusterInstanceIndex].Create(
+            BindingCluster::Context{
+                .bindingTable    = Binding::Table::GetInstance(),
+                .bindingManager  = Binding::Manager::GetInstance(),
+                .platformManager = DeviceLayer::PlatformMgr(),
+            },
+            endpointId);
         return gServers[clusterInstanceIndex].Registration();
     }
 
diff --git a/src/app/clusters/bindings/tests/TestBindingCluster.cpp b/src/app/clusters/bindings/tests/TestBindingCluster.cpp
index 99238482c1e..f25f5c0de6a 100644
--- a/src/app/clusters/bindings/tests/TestBindingCluster.cpp
+++ b/src/app/clusters/bindings/tests/TestBindingCluster.cpp
@@ -42,9 +42,18 @@ struct TestBindingCluster : public ::testing::Test
     static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
 };
 
+BindingCluster::Context CreateStandardContext()
+{
+    return BindingCluster::Context{
+        .bindingTable    = Binding::Table::GetInstance(),
+        .bindingManager  = Binding::Manager::GetInstance(),
+        .platformManager = chip::DeviceLayer::PlatformMgr(),
+    };
+}
+
 TEST_F(TestBindingCluster, TestAttributes)
 {
-    BindingCluster cluster(1);
+    BindingCluster cluster(CreateStandardContext(), 1);
 
     ASSERT_TRUE(IsAttributesListEqualTo(cluster,
                                         {
diff --git a/src/app/clusters/boolean-state-configuration-server/app_config_dependent_sources.cmake b/src/app/clusters/boolean-state-configuration-server/app_config_dependent_sources.cmake
index 72812cc67a6..09be358dfaf 100644
--- a/src/app/clusters/boolean-state-configuration-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/boolean-state-configuration-server/app_config_dependent_sources.cmake
@@ -13,6 +13,14 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.h"
+)
+
+# These are the things that BUILD.gn dependencies would pull
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
@@ -22,6 +30,4 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/BooleanStateConfigurationCluster.cpp"
     "${CLUSTER_DIR}/BooleanStateConfigurationCluster.h"
     "${CLUSTER_DIR}/boolean-state-configuration-server.h"
-    "${CLUSTER_DIR}/CodegenIntegration.cpp"
-    "${CLUSTER_DIR}/CodegenIntegration.h"
 )
diff --git a/src/app/clusters/boolean-state-configuration-server/tests/TestBooleanStateConfigurationCluster.cpp b/src/app/clusters/boolean-state-configuration-server/tests/TestBooleanStateConfigurationCluster.cpp
index c20edc18d1c..1bff2dec689 100644
--- a/src/app/clusters/boolean-state-configuration-server/tests/TestBooleanStateConfigurationCluster.cpp
+++ b/src/app/clusters/boolean-state-configuration-server/tests/TestBooleanStateConfigurationCluster.cpp
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "clusters/BooleanStateConfiguration/Commands.h"
 #include <pw_unit_test/framework.h>
 
 #include <app/DefaultSafeAttributePersistenceProvider.h>
@@ -23,6 +22,7 @@
 #include <app/server-cluster/testing/ClusterTester.h>
 #include <app/server-cluster/testing/TestServerClusterContext.h>
 #include <app/server-cluster/testing/ValidateGlobalAttributes.h>
+#include <clusters/BooleanStateConfiguration/Commands.h>
 #include <clusters/BooleanStateConfiguration/Enums.h>
 #include <clusters/BooleanStateConfiguration/Metadata.h>
 #include <lib/core/CHIPError.h>
diff --git a/src/app/clusters/boolean-state-server/app_config_dependent_sources.cmake b/src/app/clusters/boolean-state-server/app_config_dependent_sources.cmake
index 2e1e81acffb..28895720ca6 100644
--- a/src/app/clusters/boolean-state-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/boolean-state-server/app_config_dependent_sources.cmake
@@ -15,13 +15,6 @@
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
-   "${CLUSTER_DIR}/CodegenIntegration.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/BooleanStateCluster.cpp"
-    "${CLUSTER_DIR}/BooleanStateCluster.h"
-)
\ No newline at end of file
diff --git a/src/app/clusters/bridged-device-basic-information-server/BUILD.gn b/src/app/clusters/bridged-device-basic-information-server/BUILD.gn
index 07246e9bc21..17ec49f793a 100644
--- a/src/app/clusters/bridged-device-basic-information-server/BUILD.gn
+++ b/src/app/clusters/bridged-device-basic-information-server/BUILD.gn
@@ -11,5 +11,22 @@
 # 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.
-group("bridged-device-basic-information-server") {
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+source_set("bridged-device-basic-information-server") {
+  sources = [
+    "BasicInformationClusterProxy.h",
+    "BridgedDeviceBasicInformationCluster.cpp",
+    "BridgedDeviceBasicInformationCluster.h",
+    "BridgedDeviceBasicInformationDelegate.h",
+    "BridgedDeviceIcdDelegate.h",
+    "ConfigurationVersionDelegate.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/app/clusters/basic-information",
+    "${chip_root}/src/app/server-cluster",
+    "${chip_root}/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation",
+  ]
 }
diff --git a/src/app/clusters/bridged-device-basic-information-server/BasicInformationClusterProxy.h b/src/app/clusters/bridged-device-basic-information-server/BasicInformationClusterProxy.h
new file mode 100644
index 00000000000..08b44c419c8
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/BasicInformationClusterProxy.h
@@ -0,0 +1,40 @@
+/*
+ *    Copyright (c) 2026 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 <app/clusters/basic-information/BasicInformationCluster.h>
+#include <app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h>
+
+namespace chip::app::Clusters {
+
+/// Helper class that allows using a BasicInformationCluster as a ConfigurationVersionDelegate.
+///
+/// This proxy avoids having BasicInformationCluster itself inherit from ConfigurationVersionDelegate,
+/// saving flash for devices that do not need this functionality.
+class BasicInformationClusterProxy : public ConfigurationVersionDelegate
+{
+public:
+    BasicInformationClusterProxy(BasicInformationCluster & basicInfo) : mBasicInformation(basicInfo) {}
+
+    CHIP_ERROR IncreaseConfigurationVersion() override { return mBasicInformation.IncreaseConfigurationVersion(); }
+
+private:
+    BasicInformationCluster & mBasicInformation;
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.cpp b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.cpp
new file mode 100644
index 00000000000..301ee825543
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.cpp
@@ -0,0 +1,378 @@
+/*
+ *    Copyright (c) 2026 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/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.h>
+
+#include <app/persistence/AttributePersistence.h>
+#include <app/persistence/String.h>
+#include <app/server-cluster/AttributeListBuilder.h>
+#include <clusters/BridgedDeviceBasicInformation/Attributes.h>
+#include <clusters/BridgedDeviceBasicInformation/Commands.h>
+#include <clusters/BridgedDeviceBasicInformation/Events.h>
+#include <clusters/BridgedDeviceBasicInformation/Metadata.h>
+#include <lib/support/BitFlags.h>
+#include <lib/support/Span.h>
+
+#include <algorithm>
+
+using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
+using chip::Protocols::InteractionModel::Status;
+
+namespace chip::app::Clusters {
+
+namespace {
+
+static constexpr uint32_t kMinKeepActiveTimeoutMs = 30 * 1000;
+static constexpr uint32_t kMaxKeepActiveTimeoutMs = 3600 * 1000;
+
+CharSpan ToSpan(const std::string & s)
+{
+    return { s.data(), s.size() };
+}
+
+CharSpan ToSpan(const std::optional<std::string> & s)
+{
+    if (!s.has_value())
+    {
+        // Return empty span if not present
+        return {};
+    }
+    return ToSpan(*s);
+}
+
+} // namespace
+
+DataModel::ActionReturnStatus BridgedDeviceBasicInformationCluster::SetNodeLabel(CharSpan nodeLabel)
+{
+    return SetNodeLabelInternal(nodeLabel, PersistenceMode::kPersist);
+}
+
+DataModel::ActionReturnStatus BridgedDeviceBasicInformationCluster::SetNodeLabelInternal(CharSpan nodeLabel, PersistenceMode mode)
+{
+    VerifyOrReturnError(nodeLabel.size() <= Attributes::NodeLabel::TypeInfo::MaxLength(), Status::ConstraintError);
+
+    // std::string may not like a nullptr .data() when the charspan is empty.
+    const std::string newValue = nodeLabel.empty() ? std::string() : std::string{ nodeLabel.data(), nodeLabel.size() };
+
+    if (mRequiredData.nodeLabel == newValue)
+    {
+        return DataModel::ActionReturnStatus::FixedStatus::kWriteSuccessNoOp;
+    }
+
+    auto status = mClusterContext.delegate.OnNodeLabelChanged(newValue);
+    if (status != Status::Success)
+    {
+        return status;
+    }
+
+    if (mode == PersistenceMode::kPersist && mContext != nullptr)
+    {
+        AttributePersistence persistence(mContext->attributeStorage);
+        Storage::String<Attributes::NodeLabel::TypeInfo::MaxLength()> storageString;
+        storageString.SetContent(nodeLabel);
+        CHIP_ERROR err = persistence.StoreString(
+            { mPath.mEndpointId, BridgedDeviceBasicInformation::Id, Attributes::NodeLabel::Id }, storageString);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Failed to persist NodeLabel: %" CHIP_ERROR_FORMAT, err.Format());
+            return Status::Failure;
+        }
+    }
+
+    mRequiredData.nodeLabel = newValue;
+    NotifyAttributeChanged(Attributes::NodeLabel::Id);
+
+    return Status::Success;
+}
+
+CHIP_ERROR BridgedDeviceBasicInformationCluster::Startup(ServerClusterContext & context)
+{
+    ReturnErrorOnFailure(DefaultServerCluster::Startup(context));
+
+    AttributePersistence persistence(context.attributeStorage);
+    Storage::String<Attributes::NodeLabel::TypeInfo::MaxLength()> storedLabel;
+
+    if (persistence.LoadString({ mPath.mEndpointId, BridgedDeviceBasicInformation::Id, Attributes::NodeLabel::Id }, storedLabel))
+    {
+        // LoadString already handles logging in case of load errors.
+        // We do not want to re-persist what we just loaded from NVM, hence kDoNotPersist.
+        // Failure here is unlikely and most applications cannot recover from it, so we ignore the status.
+        RETURN_SAFELY_IGNORED SetNodeLabelInternal(storedLabel.Content(), PersistenceMode::kDoNotPersist);
+    }
+    else
+    {
+        // missing label, we keep whatever is already in the cluster (e.g. set at startup)
+        Storage::String<Attributes::NodeLabel::TypeInfo::MaxLength()> initialLabel;
+        initialLabel.SetContent(ToSpan(mRequiredData.nodeLabel));
+
+        // Ignore errors on purpose: not stored, but already an initial value from the app, so
+        // same value is likely to be provided again. Failure to store here should not cause the cluster
+        // to stop initializing.
+        RETURN_SAFELY_IGNORED persistence.StoreString(
+            { mPath.mEndpointId, BridgedDeviceBasicInformation::Id, Attributes::NodeLabel::Id }, initialLabel);
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR BridgedDeviceBasicInformationCluster::IncreaseConfigurationVersion()
+{
+    ReturnErrorOnFailure(mClusterContext.parentVersionConfiguration.IncreaseConfigurationVersion());
+
+    mRequiredData.configurationVersion++;
+    NotifyAttributeChanged(Attributes::ConfigurationVersion::Id);
+
+    return CHIP_NO_ERROR;
+}
+
+DataModel::ActionReturnStatus BridgedDeviceBasicInformationCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                                                  AttributeValueEncoder & encoder)
+{
+    using namespace chip::app::Clusters::BridgedDeviceBasicInformation::Attributes;
+
+    switch (request.path.mAttributeId)
+    {
+    case FeatureMap::Id:
+        return encoder.Encode(                                                                                           //
+            BitFlags<BridgedDeviceBasicInformation::Feature>()                                                           //
+                .Set(BridgedDeviceBasicInformation::Feature::kBridgedICDSupport, mClusterContext.icdDelegate != nullptr) //
+        );
+    case ClusterRevision::Id:
+        return encoder.Encode(kRevision);
+    case VendorName::Id:
+        return encoder.Encode(ToSpan(mFixedData.vendorName));
+    case VendorID::Id:
+        return encoder.Encode(mFixedData.vendorId.value_or(VendorId::NotSpecified));
+    case ProductName::Id:
+        return encoder.Encode(ToSpan(mFixedData.productName));
+    case ProductID::Id:
+        return encoder.Encode(mFixedData.productId.value_or(0));
+    case NodeLabel::Id:
+        return encoder.Encode(ToSpan(mRequiredData.nodeLabel));
+    case HardwareVersion::Id:
+        return encoder.Encode(mFixedData.hardwareVersion.value_or(0));
+    case HardwareVersionString::Id:
+        return encoder.Encode(ToSpan(mFixedData.hardwareVersionString));
+    case SoftwareVersion::Id:
+        return encoder.Encode(mFixedData.softwareVersion.value_or(0));
+    case SoftwareVersionString::Id:
+        return encoder.Encode(ToSpan(mFixedData.softwareVersionString));
+    case ManufacturingDate::Id:
+        return encoder.Encode(ToSpan(mFixedData.manufacturingDate));
+    case PartNumber::Id:
+        return encoder.Encode(ToSpan(mFixedData.partNumber));
+    case ProductURL::Id:
+        return encoder.Encode(ToSpan(mFixedData.productUrl));
+    case ProductLabel::Id:
+        return encoder.Encode(ToSpan(mFixedData.productLabel));
+    case SerialNumber::Id:
+        return encoder.Encode(ToSpan(mFixedData.serialNumber));
+    case Reachable::Id:
+        return encoder.Encode(mRequiredData.reachable);
+    case UniqueID::Id:
+        return encoder.Encode(ToSpan(mRequiredData.uniqueId));
+    case ProductAppearance::Id:
+        return encoder.Encode(
+            mFixedData.productAppearance.value_or(BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::Type{}));
+    case ConfigurationVersion::Id:
+        return encoder.Encode(mRequiredData.configurationVersion);
+    default:
+        return Status::UnsupportedAttribute;
+    }
+}
+
+DataModel::ActionReturnStatus BridgedDeviceBasicInformationCluster::WriteAttribute(const DataModel::WriteAttributeRequest & request,
+                                                                                   AttributeValueDecoder & aDecoder)
+{
+    switch (request.path.mAttributeId)
+    {
+    case Attributes::NodeLabel::Id: {
+        CharSpan newNodeLabel;
+        ReturnErrorOnFailure(aDecoder.Decode(newNodeLabel));
+        return SetNodeLabel(newNodeLabel);
+    }
+    case Attributes::ConfigurationVersion::Id:
+        return Status::UnsupportedWrite; // Not writable via Matter
+    default:
+        // Other attributes are not writable.
+        return Status::UnsupportedWrite;
+    }
+}
+
+CHIP_ERROR BridgedDeviceBasicInformationCluster::Attributes(const ConcreteClusterPath & path,
+                                                            ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder)
+{
+    using namespace chip::app::Clusters::BridgedDeviceBasicInformation::Attributes;
+
+    AttributeListBuilder::OptionalAttributeEntry optionalAttributes[] = {
+        { mFixedData.vendorName.has_value(), VendorName::kMetadataEntry },
+        { mFixedData.vendorId.has_value(), VendorID::kMetadataEntry },
+        { mFixedData.productName.has_value(), ProductName::kMetadataEntry },
+        { mFixedData.productId.has_value(), ProductID::kMetadataEntry },
+        { true, NodeLabel::kMetadataEntry }, // Always present
+        { mFixedData.hardwareVersion.has_value(), HardwareVersion::kMetadataEntry },
+        { mFixedData.hardwareVersionString.has_value(), HardwareVersionString::kMetadataEntry },
+        { mFixedData.softwareVersion.has_value(), SoftwareVersion::kMetadataEntry },
+        { mFixedData.softwareVersionString.has_value(), SoftwareVersionString::kMetadataEntry },
+        { mFixedData.manufacturingDate.has_value(), ManufacturingDate::kMetadataEntry },
+        { mFixedData.partNumber.has_value(), PartNumber::kMetadataEntry },
+        { mFixedData.productUrl.has_value(), ProductURL::kMetadataEntry },
+        { mFixedData.productLabel.has_value(), ProductLabel::kMetadataEntry },
+        { mFixedData.serialNumber.has_value(), SerialNumber::kMetadataEntry },
+        { true, UniqueID::kMetadataEntry }, // mandatory for new revisions
+        { mFixedData.productAppearance.has_value(), ProductAppearance::kMetadataEntry },
+        { true, ConfigurationVersion::kMetadataEntry }, // Always present
+    };
+
+    AttributeListBuilder listBuilder(builder);
+
+    // NOTE:
+    //   - only Reachable is in kMandatory, even though UniqueID is mandatory for
+    //     revision >= 4 (so we hardcode true above)
+    return listBuilder.Append(Span(BridgedDeviceBasicInformation::Attributes::kMandatoryMetadata), Span(optionalAttributes));
+}
+
+CHIP_ERROR BridgedDeviceBasicInformationCluster::AcceptedCommands(const ConcreteClusterPath & path,
+                                                                  ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder)
+{
+    if (mClusterContext.icdDelegate != nullptr)
+    {
+        static const DataModel::AcceptedCommandEntry kCommands[]{
+            Commands::KeepActive::kMetadataEntry,
+        };
+
+        ReturnErrorOnFailure(builder.ReferenceExisting(kCommands));
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+void BridgedDeviceBasicInformationCluster::Shutdown(ClusterShutdownType s)
+{
+    DefaultServerCluster::Shutdown(s);
+
+    // if we are shutting down, stop processing active timers
+    CancelPendingActiveTimer();
+
+    // we also do not expect to stay active to be propagated. Cluster is inactive.
+    mStayActiveDurationMs.reset();
+}
+
+std::optional<DataModel::ActionReturnStatus>
+BridgedDeviceBasicInformationCluster::InvokeCommand(const DataModel::InvokeRequest & request,
+                                                    chip::TLV::TLVReader & input_arguments, CommandHandler * handler)
+{
+    using namespace chip::app::Clusters::BridgedDeviceBasicInformation::Commands;
+    switch (request.path.mCommandId)
+    {
+    case KeepActive::Id: {
+        KeepActive::DecodableType commandData;
+        ReturnErrorOnFailure(DataModel::Decode(input_arguments, commandData));
+
+        VerifyOrReturnError(mClusterContext.icdDelegate != nullptr, Status::UnsupportedCommand);
+
+        VerifyOrReturnError(commandData.timeoutMs >= kMinKeepActiveTimeoutMs, Status::ConstraintError);
+        VerifyOrReturnError(commandData.timeoutMs <= kMaxKeepActiveTimeoutMs, Status::ConstraintError);
+
+        if (!mStayActiveDurationMs.has_value())
+        {
+            // brand new "pending active" state
+            mStayActiveDurationMs = commandData.stayActiveDuration;
+            StartPendingActiveTimer(System::Clock::Milliseconds32(commandData.timeoutMs));
+            return mClusterContext.icdDelegate->OnEnterPendingActive();
+        }
+
+        // already in pending active state, may need to sleep longer. The logic is:
+        //   - we need to keep the "max" stay active duration
+        //   - we need to potentially extend our timeout
+        mStayActiveDurationMs = std::max(mStayActiveDurationMs.value_or(0), commandData.stayActiveDuration);
+        StartPendingActiveTimer(System::Clock::Milliseconds32(commandData.timeoutMs));
+
+        return Status::Success;
+    }
+    default:
+        return Status::UnsupportedCommand;
+    }
+}
+
+void BridgedDeviceBasicInformationCluster::GenerateLeaveEvent()
+{
+    VerifyOrReturn(mContext != nullptr);
+
+    BridgedDeviceBasicInformation::Events::Leave::Type event;
+    mContext->interactionContext.eventsGenerator.GenerateEvent(event, mPath.mEndpointId);
+}
+
+void BridgedDeviceBasicInformationCluster::SetReachable(bool reachable)
+{
+    VerifyOrReturn(mRequiredData.reachable != reachable);
+
+    mRequiredData.reachable = reachable;
+    NotifyAttributeChanged(Attributes::Reachable::Id);
+
+    VerifyOrReturn(mContext != nullptr);
+    BridgedDeviceBasicInformation::Events::ReachableChanged::Type event;
+    event.reachableNewValue = reachable;
+    mContext->interactionContext.eventsGenerator.GenerateEvent(event, mPath.mEndpointId);
+}
+
+void BridgedDeviceBasicInformationCluster::TimerFired()
+{
+    VerifyOrReturn(mStayActiveDurationMs.has_value());
+
+    mStayActiveDurationMs.reset();
+
+    VerifyOrReturn(mClusterContext.icdDelegate != nullptr);
+    mClusterContext.icdDelegate->OnPendingActiveExpired();
+}
+
+void BridgedDeviceBasicInformationCluster::StartPendingActiveTimer(System::Clock::Milliseconds32 timeout)
+{
+    System::Clock::Timestamp nextTimeout = mClusterContext.timerDelegate.GetCurrentMonotonicTimestamp() + timeout;
+
+    // extending the timeout (or no timeout at all...)
+    VerifyOrReturn(nextTimeout > mPendingActiveExpiryTime);
+
+    // start a new timer
+    CancelPendingActiveTimer();
+    LogErrorOnFailure(mClusterContext.timerDelegate.StartTimer(this, timeout));
+    mPendingActiveExpiryTime = nextTimeout;
+}
+
+void BridgedDeviceBasicInformationCluster::CancelPendingActiveTimer()
+{
+    mClusterContext.timerDelegate.CancelTimer(this);
+
+    // mark as "expired now" to not assume there is a pending timer in `Start`
+    mPendingActiveExpiryTime = mClusterContext.timerDelegate.GetCurrentMonotonicTimestamp();
+}
+
+void BridgedDeviceBasicInformationCluster::NotifyDeviceActive()
+{
+    VerifyOrReturn(mStayActiveDurationMs.has_value());
+
+    if (mContext != nullptr)
+    {
+        BridgedDeviceBasicInformation::Events::ActiveChanged::Type event;
+        event.promisedActiveDuration = *mStayActiveDurationMs;
+        mContext->interactionContext.eventsGenerator.GenerateEvent(event, mPath.mEndpointId);
+    }
+
+    CancelPendingActiveTimer();
+    mStayActiveDurationMs.reset();
+}
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.h b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.h
new file mode 100644
index 00000000000..7d9a847d1bb
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.h
@@ -0,0 +1,177 @@
+/*
+ *    Copyright (c) 2026 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 <app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationDelegate.h>
+#include <app/clusters/bridged-device-basic-information-server/BridgedDeviceIcdDelegate.h>
+#include <app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h>
+#include <app/server-cluster/DefaultServerCluster.h>
+#include <clusters/BridgedDeviceBasicInformation/ClusterId.h>
+#include <clusters/BridgedDeviceBasicInformation/Structs.h>
+#include <lib/support/TimerDelegate.h>
+
+#include <optional>
+#include <string>
+#include <utility>
+
+namespace chip::app::Clusters {
+
+/// This class provides information about bridged devices.
+///
+/// Since it is intended for bridge uses (assumed higher resources devices)
+/// it uses std::string and similar data types for ease of use.
+///
+/// Note: StartUp/ShutDown events are intentionally NOT supported.
+///   - Node-wide startup/shutdown events are provided by the Node's Basic Information cluster.
+///   - Per-endpoint (bridged device) lifecycle is detectable via the Descriptor cluster.
+///   - They are marked as Optional (O) in the Bridged Device Basic Information specification.
+///
+/// Note: DeviceLocation attribute (0x0017) is not supported as it is not in the standard Bridged Device Basic Information Cluster
+/// XML.
+class BridgedDeviceBasicInformationCluster : public DefaultServerCluster, public TimerContext
+{
+public:
+    struct Context
+    {
+        // NOTE: These delegate references are used throughout the cluster's lifetime.
+        // Their lifetimes MUST be greater than or equal to the lifetime of this cluster instance.
+        ConfigurationVersionDelegate & parentVersionConfiguration;
+        BridgedDeviceBasicInformationDelegate & delegate;
+        TimerDelegate & timerDelegate;
+        BridgedDeviceIcdDelegate * icdDelegate = nullptr; // if nullptr, ICD support feature is disabled
+    };
+
+    /// Most attributes in the bridged device basic information cluster are fixed
+    /// and cannot be changed after construction. This class defines those attributes.
+    ///
+    ///
+    /// Attribute will be exposed if the optional values have a value.
+    struct FixedData
+    {
+        std::optional<std::string> vendorName;
+        std::optional<VendorId> vendorId;
+        std::optional<std::string> productName;
+        std::optional<uint16_t> productId;
+        std::optional<uint16_t> hardwareVersion;
+        std::optional<std::string> hardwareVersionString;
+        std::optional<uint32_t> softwareVersion;
+        std::optional<std::string> softwareVersionString;
+        std::optional<std::string> manufacturingDate;
+        std::optional<std::string> partNumber;
+        std::optional<std::string> productUrl;
+        std::optional<std::string> productLabel;
+        std::optional<std::string> serialNumber;
+        std::optional<BridgedDeviceBasicInformation::Structs::ProductAppearanceStruct::Type> productAppearance;
+    };
+
+    /// Mandatory data for every bridged device
+    struct RequiredData
+    {
+        std::string uniqueId;   // Fixed once set
+        bool reachable = false; // initial value for reachable
+        std::string nodeLabel;
+        uint32_t configurationVersion = 1;
+    };
+
+    BridgedDeviceBasicInformationCluster(EndpointId endpointId, RequiredData && required, FixedData && fixedData,
+                                         Context && context) :
+        DefaultServerCluster({ endpointId, BridgedDeviceBasicInformation::Id }),
+        mRequiredData(std::move(required)), mFixedData(std::move(fixedData)), mClusterContext(std::move(context))
+
+    {}
+
+    bool GetReachable() const { return mRequiredData.reachable; }
+    void SetReachable(bool reachable);
+
+    const std::string & GetUniqueId() const { return mRequiredData.uniqueId; }
+    const FixedData & GetFixedData() const { return mFixedData; }
+
+    const std::string & GetNodeLabel() const { return mRequiredData.nodeLabel; }
+    DataModel::ActionReturnStatus SetNodeLabel(CharSpan nodeLabel);
+
+    uint32_t GetConfigurationVersion() const { return mRequiredData.configurationVersion; }
+
+    /// Increases the configuration version and ALSO increases the device
+    /// configuration version. Specifically handles the spec requirement of:
+    ///
+    /// 9.13.5.4 ConfigurationVersion Attribute:
+    ///   ...
+    ///   If the bridge detects a change on a bridged device, which it deems as a
+    ///   change in the configuration of the bridged device, it SHALL increase this
+    ///   attribute (and the corresponding attribute on the bridge itself)
+    CHIP_ERROR IncreaseConfigurationVersion();
+
+    void GenerateLeaveEvent();
+
+    // Application interface for ICD
+
+    /// Returns the requested "StayActiveDuration" when the cluster is in "pending-active" state.
+    ///
+    /// When the bridged device is checking in, the application should keep it active
+    /// for the time period here and should `NotifyDeviceActive`
+    std::optional<uint32_t> GetRequestedStayActiveDurationMs() const { return mStayActiveDurationMs; }
+    void NotifyDeviceActive();
+
+    /// ServerClusterInterface (DefaultServerCluster overrides)
+
+    CHIP_ERROR Startup(ServerClusterContext & context) override;
+    void Shutdown(ClusterShutdownType) override;
+    DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                AttributeValueEncoder & encoder) override;
+    DataModel::ActionReturnStatus WriteAttribute(const DataModel::WriteAttributeRequest & request,
+                                                 AttributeValueDecoder & aDecoder) override;
+    CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
+
+    CHIP_ERROR AcceptedCommands(const ConcreteClusterPath & path,
+                                ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder) override;
+
+    std::optional<DataModel::ActionReturnStatus> InvokeCommand(const DataModel::InvokeRequest & request,
+                                                               chip::TLV::TLVReader & input_arguments,
+                                                               CommandHandler * handler) override;
+
+private:
+    enum class PersistenceMode
+    {
+        kPersist,
+        kDoNotPersist,
+    };
+
+    /// Updates the NodeLabel attribute value with optional persistence.
+    ///
+    /// This internal helper validates the new value via the delegate, persists it to NVM if requested,
+    /// and then updates the in-memory state and notifies subscribers.
+    ///
+    /// @param nodeLabel The new node label to set.
+    /// @param mode Whether to persist the new value to NVM.
+    /// @return Status code indicating the result of the operation.
+    DataModel::ActionReturnStatus SetNodeLabelInternal(CharSpan nodeLabel, PersistenceMode mode);
+
+    // TimerContext
+    void TimerFired() override;
+
+    void StartPendingActiveTimer(System::Clock::Milliseconds32 timeoutMs);
+    void CancelPendingActiveTimer();
+
+    RequiredData mRequiredData;
+    const FixedData mFixedData;
+    const Context mClusterContext;
+
+    std::optional<uint32_t> mStayActiveDurationMs; // Present only when pending active
+    System::Clock::Timestamp mPendingActiveExpiryTime{};
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationDelegate.h b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationDelegate.h
new file mode 100644
index 00000000000..dffbdc795db
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationDelegate.h
@@ -0,0 +1,39 @@
+/*
+ *    Copyright (c) 2026 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 <protocols/interaction_model/Constants.h>
+#include <string>
+
+namespace chip::app::Clusters {
+
+class BridgedDeviceBasicInformationDelegate
+{
+public:
+    virtual ~BridgedDeviceBasicInformationDelegate() = default;
+
+    /// Called when the NodeLabel attribute is about to be changed.
+    ///
+    /// If a non-success status is returned, the attribute write will fail.
+    /// Note: This is NOT called for no-op writes where the value has not changed.
+    virtual Protocols::InteractionModel::Status OnNodeLabelChanged(const std::string & newNodeLabel)
+    {
+        return Protocols::InteractionModel::Status::Success;
+    }
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceIcdDelegate.h b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceIcdDelegate.h
new file mode 100644
index 00000000000..95fb61fca3f
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/BridgedDeviceIcdDelegate.h
@@ -0,0 +1,42 @@
+/*
+ *    Copyright (c) 2026 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 <protocols/interaction_model/StatusCode.h>
+
+namespace chip::app::Clusters {
+
+/// This handles application notifications for bridged devices that support ICD.
+///
+/// Specifically, it allows the application to be notified when a `KeepActive` command is requested.
+class BridgedDeviceIcdDelegate
+{
+public:
+    virtual ~BridgedDeviceIcdDelegate() = default;
+
+    /// Called when the cluster enters the PendingActive state.
+    ///
+    /// When the bridged device checks in, the application MUST query the cluster for
+    /// the corresponding stay-active duration as it may change (multiple requests for KeepActive
+    /// will keep a max value of the stay active duration).
+    virtual Protocols::InteractionModel::Status OnEnterPendingActive() = 0;
+
+    /// Called when the PendingActive state timer expires.
+    virtual void OnPendingActiveExpired() = 0;
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h b/src/app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h
new file mode 100644
index 00000000000..883ca6afa24
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h
@@ -0,0 +1,37 @@
+/*
+ *    Copyright (c) 2026 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 <lib/core/CHIPError.h>
+
+namespace chip::app::Clusters {
+
+/// Represents a class that tracks a "configuration version" and accepts increases
+/// to such a version.
+///
+/// For example BasicInformationCluster may increase a global configuration version and
+/// will notify when such a configuration change occurs.
+class ConfigurationVersionDelegate
+{
+public:
+    virtual ~ConfigurationVersionDelegate() = default;
+
+    // Bump the configuration version by 1
+    virtual CHIP_ERROR IncreaseConfigurationVersion() = 0;
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/bridged-device-basic-information-server/app_config_dependent_sources.cmake b/src/app/clusters/bridged-device-basic-information-server/app_config_dependent_sources.cmake
index 2a14990574b..0851afcf260 100644
--- a/src/app/clusters/bridged-device-basic-information-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/bridged-device-basic-information-server/app_config_dependent_sources.cmake
@@ -18,3 +18,4 @@ TARGET_SOURCES(
   PRIVATE
   "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
+
diff --git a/src/app/clusters/bridged-device-basic-information-server/tests/BUILD.gn b/src/app/clusters/bridged-device-basic-information-server/tests/BUILD.gn
new file mode 100644
index 00000000000..232e5be004f
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/tests/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright (c) 2026 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("${chip_root}/build/chip/chip_test_suite.gni")
+
+chip_test_suite("tests") {
+  output_name = "libTestBridgedDeviceBasicInformationCluster"
+
+  test_sources = [ "TestBridgedDeviceBasicInformationCluster.cpp" ]
+
+  cflags = [ "-Wconversion" ]
+
+  public_deps = [
+    "${chip_root}/src/app/clusters/bridged-device-basic-information-server",
+    "${chip_root}/src/app/server-cluster/testing",
+    "${chip_root}/src/app/tests:helpers",
+    "${chip_root}/src/lib/core:string-builder-adapters",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/lib/support:timer-delegate-mock",
+  ]
+}
diff --git a/src/app/clusters/bridged-device-basic-information-server/tests/TestBridgedDeviceBasicInformationCluster.cpp b/src/app/clusters/bridged-device-basic-information-server/tests/TestBridgedDeviceBasicInformationCluster.cpp
new file mode 100644
index 00000000000..b61b849d018
--- /dev/null
+++ b/src/app/clusters/bridged-device-basic-information-server/tests/TestBridgedDeviceBasicInformationCluster.cpp
@@ -0,0 +1,1056 @@
+/*
+ *    Copyright (c) 2026 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 <pw_unit_test/framework.h>
+
+#include <app/clusters/basic-information/BasicInformationCluster.h>
+#include <app/clusters/bridged-device-basic-information-server/BasicInformationClusterProxy.h>
+#include <app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationCluster.h>
+#include <app/clusters/bridged-device-basic-information-server/BridgedDeviceBasicInformationDelegate.h>
+#include <app/clusters/bridged-device-basic-information-server/ConfigurationVersionDelegate.h>
+#include <app/data-model-provider/MetadataTypes.h>
+#include <app/persistence/AttributePersistence.h>
+#include <app/persistence/String.h>
+#include <app/server-cluster/DefaultServerCluster.h>
+#include <app/server-cluster/testing/AttributeTesting.h>
+#include <app/server-cluster/testing/ClusterTester.h>
+#include <app/server-cluster/testing/TestEventGenerator.h>
+#include <app/server-cluster/testing/TestServerClusterContext.h>
+#include <app/server-cluster/testing/ValidateGlobalAttributes.h>
+#include <clusters/BridgedDeviceBasicInformation/Commands.h>
+#include <clusters/BridgedDeviceBasicInformation/Enums.h>
+#include <clusters/BridgedDeviceBasicInformation/Events.h>
+#include <clusters/BridgedDeviceBasicInformation/Metadata.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/CHIPVendorIdentifiers.hpp>
+#include <lib/core/DataModelTypes.h>
+#include <lib/support/BitFlags.h>
+#include <lib/support/ReadOnlyBuffer.h>
+#include <lib/support/TimerDelegateMock.h>
+#include <protocols/interaction_model/Constants.h>
+#include <string>
+
+namespace {
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
+using namespace chip::Testing;
+
+using chip::Protocols::InteractionModel::Status;
+
+constexpr EndpointId kTestEndpointId = 1;
+
+class MockConfigurationManager : public DeviceLayer::ConfigurationManager
+{
+public:
+    CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan & buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetConfigurationVersion(uint32_t & configurationVer) override
+    {
+        configurationVer = mConfigurationVersion;
+        return CHIP_NO_ERROR;
+    }
+    CHIP_ERROR GetFirmwareBuildChipEpochTime(System::Clock::Seconds32 & buildTime) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+#if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
+    CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR IncrementLifetimeCounter() override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR SetRotatingDeviceIdUniqueId(const ByteSpan & uniqueIdSpan) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+#endif
+    CHIP_ERROR GetRegulatoryLocation(uint8_t & location) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreSoftwareVersion(uint32_t softwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreConfigurationVersion(uint32_t configurationVer) override
+    {
+        if (mReturnError != CHIP_NO_ERROR)
+        {
+            return mReturnError;
+        }
+        mConfigurationVersion = configurationVer;
+        mStoreCalled++;
+        return CHIP_NO_ERROR;
+    }
+    CHIP_ERROR StoreHardwareVersion(uint16_t hardwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreRegulatoryLocation(uint8_t location) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetRebootCount(uint32_t & rebootCount) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetBootReason(uint32_t & bootReason) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreBootReason(uint32_t bootReason) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetFailSafeArmed(bool & val) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR SetFailSafeArmed(bool val) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+    bool IsFullyProvisioned() override { return true; }
+    void InitiateFactoryReset() override {}
+    void LogDeviceConfig() override {}
+    bool IsCommissionableDeviceTypeEnabled() override { return false; }
+    CHIP_ERROR GetDeviceTypeId(uint32_t & deviceType) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    bool IsCommissionableDeviceNameEnabled() override { return false; }
+    CHIP_ERROR GetCommissionableDeviceName(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetInitialPairingHint(uint16_t & pairingHint) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetInitialPairingInstruction(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetSecondaryPairingHint(uint16_t & pairingHint) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetSecondaryPairingInstruction(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+
+    CHIP_ERROR Init() override { return CHIP_NO_ERROR; }
+    bool CanFactoryReset() override { return true; }
+    CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+    CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+
+    virtual void RunUnitTests() override {}
+
+    uint32_t mConfigurationVersion = 10;
+    uint32_t mStoreCalled          = 0;
+    CHIP_ERROR mReturnError        = CHIP_NO_ERROR;
+};
+
+class MockDelegate : public BridgedDeviceBasicInformationDelegate
+{
+public:
+    Status OnNodeLabelChanged(const std::string & newNodeLabel) override
+    {
+        mNodeLabelChangedCalled = true;
+        mLastNodeLabel          = newNodeLabel;
+        return mReturnStatus;
+    }
+
+    bool mNodeLabelChangedCalled = false;
+    std::string mLastNodeLabel;
+    Status mReturnStatus = Status::Success;
+};
+
+class MockVersionConfigurationDelegate : public ConfigurationVersionDelegate
+{
+public:
+    CHIP_ERROR IncreaseConfigurationVersion() override
+    {
+        mVersion++;
+        return CHIP_NO_ERROR;
+    }
+
+    uint32_t mVersion = 0;
+};
+
+class MockDeviceInstanceInfoProvider : public DeviceLayer::DeviceInstanceInfoProvider
+{
+public:
+    CHIP_ERROR GetVendorName(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetVendorId(uint16_t & vendorId) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetProductName(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetProductId(uint16_t & productId) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+};
+
+class TestBridgedDeviceIcdDelegate : public BridgedDeviceIcdDelegate
+{
+public:
+    uint32_t mEnterCalled   = 0;
+    uint32_t mExpiredCalled = 0;
+
+    Status OnEnterPendingActive() override
+    {
+        mEnterCalled++;
+        return Status::Success;
+    }
+
+    /// Called when the PendingActive state timer expires.
+    void OnPendingActiveExpired() override { mExpiredCalled++; }
+};
+
+struct TestBridgedDeviceBasicInformationCluster : public ::testing::Test
+{
+    static void SetUpTestSuite() { ASSERT_EQ(Platform::MemoryInit(), CHIP_NO_ERROR); }
+    static void TearDownTestSuite() { Platform::MemoryShutdown(); }
+
+    MockDeviceInstanceInfoProvider mDeviceInfoProvider;
+    MockConfigurationManager mMockConfigManager;
+
+    BasicInformationCluster::Context mBasicInfoContext = {
+        .deviceInstanceInfoProvider = mDeviceInfoProvider,
+        .configurationManager       = mMockConfigManager,
+        .platformManager            = DeviceLayer::PlatformMgr(),
+        .subscriptionsPerFabric     = 1,
+    };
+
+    TestServerClusterContext mContext;
+    MockDelegate mDelegate;
+    MockVersionConfigurationDelegate mMockVersionConfiguration;
+    chip::TimerDelegateMock mMockTimer;
+};
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestEmptyAttributes)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "foo-bar",
+                                                     .reachable = true,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_TRUE(IsAttributesListEqualTo(cluster,
+                                        {
+                                            Attributes::UniqueID::kMetadataEntry,
+                                            Attributes::Reachable::kMetadataEntry,
+                                            Attributes::NodeLabel::kMetadataEntry,
+                                            Attributes::ConfigurationVersion::kMetadataEntry,
+                                        }));
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestPartialAttributes)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "foo-bar",
+                                                     .reachable            = true,
+                                                     .nodeLabel            = "mylabel",
+                                                     .configurationVersion = 200u,
+                                                 },
+                                                 {
+                                                     .partNumber = "010203",
+                                                 },
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_TRUE(IsAttributesListEqualTo(cluster,
+                                        {
+                                            Attributes::UniqueID::kMetadataEntry,
+                                            Attributes::Reachable::kMetadataEntry,
+                                            Attributes::NodeLabel::kMetadataEntry,
+                                            Attributes::PartNumber::kMetadataEntry,
+                                            Attributes::ConfigurationVersion::kMetadataEntry,
+                                        }));
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestAllAttributes)
+{
+    BridgedDeviceBasicInformationCluster cluster(
+        kTestEndpointId, { .uniqueId = "foo-bar", .reachable = true, .nodeLabel = "Remote", .configurationVersion = 123u },
+        {
+            .vendorName            = "ACME",
+            .vendorId              = VendorId::Common,
+            .productName           = "Bridge",
+            .productId             = 0x1234,
+            .hardwareVersion       = 0x1122,
+            .hardwareVersionString = "NewVersion-A",
+            .softwareVersion       = 0x11223344,
+            .softwareVersionString = "FancyBuild",
+            .manufacturingDate     = "010203",
+            .partNumber            = "A-B-C",
+            .productUrl            = "http://example.com",
+            .productLabel          = "New",
+            .serialNumber          = "SN123456",
+            .productAppearance =
+                Structs::ProductAppearanceStruct::Type{
+                    .finish       = ProductFinishEnum::kPolished,
+                    .primaryColor = ColorEnum::kFuchsia,
+                },
+        },
+        {
+            .parentVersionConfiguration = mMockVersionConfiguration,
+            .delegate                   = mDelegate,
+            .timerDelegate              = mMockTimer,
+        });
+    EXPECT_TRUE(IsAttributesListEqualTo(cluster,
+                                        {
+                                            Attributes::VendorName::kMetadataEntry,
+                                            Attributes::VendorID::kMetadataEntry,
+                                            Attributes::ProductName::kMetadataEntry,
+                                            Attributes::ProductID::kMetadataEntry,
+                                            Attributes::NodeLabel::kMetadataEntry,
+                                            Attributes::HardwareVersion::kMetadataEntry,
+                                            Attributes::HardwareVersionString::kMetadataEntry,
+                                            Attributes::SoftwareVersion::kMetadataEntry,
+                                            Attributes::SoftwareVersionString::kMetadataEntry,
+                                            Attributes::ManufacturingDate::kMetadataEntry,
+                                            Attributes::PartNumber::kMetadataEntry,
+                                            Attributes::ProductURL::kMetadataEntry,
+                                            Attributes::ProductLabel::kMetadataEntry,
+                                            Attributes::SerialNumber::kMetadataEntry,
+                                            Attributes::Reachable::kMetadataEntry,
+                                            Attributes::UniqueID::kMetadataEntry,
+                                            Attributes::ProductAppearance::kMetadataEntry,
+                                            Attributes::ConfigurationVersion::kMetadataEntry,
+                                        }));
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestAttributeReads)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "test-unique-id",
+                                                     .reachable            = true,
+                                                     .nodeLabel            = "TestLabel",
+                                                     .configurationVersion = 5u,
+                                                 },
+                                                 {
+                                                     .vendorName            = "TestVendor",
+                                                     .vendorId              = VendorId::TestVendor1,
+                                                     .productName           = "TestProduct",
+                                                     .productId             = 0xABCD,
+                                                     .hardwareVersion       = 1,
+                                                     .hardwareVersionString = "v1.0",
+                                                     .softwareVersion       = 2,
+                                                     .softwareVersionString = "v2.0",
+                                                     .manufacturingDate     = "20240101",
+                                                     .partNumber            = "PN123",
+                                                     .productUrl            = "http://test.com",
+                                                     .productLabel          = "Test Product Label",
+                                                     .serialNumber          = "SN789",
+                                                     .productAppearance =
+                                                         Structs::ProductAppearanceStruct::Type{
+                                                             .finish       = ProductFinishEnum::kMatte,
+                                                             .primaryColor = ColorEnum::kRed,
+                                                         },
+                                                 },
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    ClusterTester tester(cluster);
+
+    CharSpan charSpanVal;
+    uint16_t u16Val;
+    uint32_t u32Val;
+    VendorId vendorIdVal;
+    bool boolVal;
+
+    EXPECT_EQ(tester.ReadAttribute(Attributes::UniqueID::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("test-unique-id")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::Reachable::Id, boolVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(boolVal);
+    EXPECT_EQ(tester.ReadAttribute(Attributes::VendorName::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("TestVendor")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::VendorID::Id, vendorIdVal), CHIP_NO_ERROR);
+    EXPECT_EQ(vendorIdVal, VendorId::TestVendor1);
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ProductName::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("TestProduct")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ProductID::Id, u16Val), CHIP_NO_ERROR);
+    EXPECT_EQ(u16Val, 0xABCD);
+    EXPECT_EQ(tester.ReadAttribute(Attributes::NodeLabel::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("TestLabel")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::HardwareVersion::Id, u16Val), CHIP_NO_ERROR);
+    EXPECT_EQ(u16Val, 1u);
+    EXPECT_EQ(tester.ReadAttribute(Attributes::HardwareVersionString::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("v1.0")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::SoftwareVersion::Id, u32Val), CHIP_NO_ERROR);
+    EXPECT_EQ(u32Val, 2u);
+    EXPECT_EQ(tester.ReadAttribute(Attributes::SoftwareVersionString::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("v2.0")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ManufacturingDate::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("20240101")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::PartNumber::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("PN123")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ProductURL::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("http://test.com")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ProductLabel::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("Test Product Label")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::SerialNumber::Id, charSpanVal), CHIP_NO_ERROR);
+    EXPECT_TRUE(charSpanVal.data_equal(CharSpan::fromCharString("SN789")));
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ConfigurationVersion::Id, u32Val), CHIP_NO_ERROR);
+    EXPECT_EQ(u32Val, 5u);
+
+    Structs::ProductAppearanceStruct::Type productAppearance;
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ProductAppearance::Id, productAppearance), CHIP_NO_ERROR);
+    EXPECT_EQ(productAppearance.finish, ProductFinishEnum::kMatte);
+    EXPECT_EQ(productAppearance.primaryColor, ColorEnum::kRed);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestKeepActiveCommand)
+{
+    TestBridgedDeviceIcdDelegate icdDelegate;
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "icd-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                     .icdDelegate                = &icdDelegate,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    constexpr uint32_t kStayActiveDurationMs = 1000;
+
+    Commands::KeepActive::Type request;
+    request.stayActiveDuration = kStayActiveDurationMs;
+    request.timeoutMs          = 30000;
+
+    auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+    ASSERT_TRUE(response.IsSuccess());
+    EXPECT_EQ(icdDelegate.mEnterCalled, 1u);
+    EXPECT_EQ(icdDelegate.mExpiredCalled, 0u);
+
+    EXPECT_EQ(cluster.GetRequestedStayActiveDurationMs(), kStayActiveDurationMs);
+
+    EXPECT_TRUE(mMockTimer.IsTimerActive(&cluster));
+
+    // notify device is active and see that the cluster handles it correctly
+    cluster.NotifyDeviceActive();
+    EXPECT_FALSE(cluster.GetRequestedStayActiveDurationMs().has_value());
+    EXPECT_FALSE(mMockTimer.IsTimerActive(&cluster));
+
+    // validate that an event is generated
+    std::optional<LogOnlyEvents::EventInformation> eventInfo = mContext.EventsGenerator().GetNextEvent();
+    ASSERT_NE(eventInfo, std::nullopt);
+    // NOLINTBEGIN(bugprone-unchecked-optional-access)
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mClusterId, Id);
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mEventId, Events::ActiveChanged::Id);
+
+    Events::ActiveChanged::DecodableType decodedEvent;
+    ASSERT_EQ(eventInfo->GetEventData(decodedEvent), CHIP_NO_ERROR);
+    EXPECT_EQ(decodedEvent.promisedActiveDuration, kStayActiveDurationMs);
+    // NOLINTEND(bugprone-unchecked-optional-access)
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestNotifyDeviceActiveWithoutRequestedDuration)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "no-icd",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    // Call NotifyDeviceActive when not in pending state
+    // Should NOT generate an event and NOT crash
+    cluster.NotifyDeviceActive();
+
+    EXPECT_EQ(mContext.EventsGenerator().GetNextEvent(), std::nullopt);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestShutdownCancelsTimer)
+{
+    TestBridgedDeviceIcdDelegate icdDelegate;
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "icd-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                     .icdDelegate                = &icdDelegate,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    Commands::KeepActive::Type request;
+    request.stayActiveDuration = 1000;
+    request.timeoutMs          = 30000;
+
+    auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+    EXPECT_TRUE(response.IsSuccess());
+    EXPECT_TRUE(mMockTimer.IsTimerActive(&cluster));
+
+    cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+    EXPECT_FALSE(mMockTimer.IsTimerActive(&cluster));
+    EXPECT_FALSE(cluster.GetRequestedStayActiveDurationMs().has_value());
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestKeepActiveTimerNoRegression)
+{
+    TestBridgedDeviceIcdDelegate icdDelegate;
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "icd-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                     .icdDelegate                = &icdDelegate,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    // Initial request: timeout 60s
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 1000;
+        request.timeoutMs          = 60000;
+        EXPECT_TRUE(tester.Invoke<Commands::KeepActive::Type>(request).IsSuccess());
+    }
+
+    // Advance 10s. Remaining is 50s.
+    mMockTimer.AdvanceClock(System::Clock::Milliseconds32(10000));
+
+    // Second request: timeout 30s. This should be ignored for timer extension because 30s < 50s.
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 1000;
+        request.timeoutMs          = 30000;
+        EXPECT_TRUE(tester.Invoke<Commands::KeepActive::Type>(request).IsSuccess());
+    }
+
+    // Advance another 35s (total 45s from start). Timer should still be active.
+    mMockTimer.AdvanceClock(System::Clock::Milliseconds32(35000));
+    EXPECT_TRUE(mMockTimer.IsTimerActive(&cluster));
+
+    // Advance another 20s (total 65s from start). Timer should have fired.
+    mMockTimer.AdvanceClock(System::Clock::Milliseconds32(20000));
+    EXPECT_FALSE(mMockTimer.IsTimerActive(&cluster));
+    EXPECT_EQ(icdDelegate.mExpiredCalled, 1u);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestKeepActiveCommandMultipleRequests)
+{
+    TestBridgedDeviceIcdDelegate icdDelegate;
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "icd-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                     .icdDelegate                = &icdDelegate,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    // Initial request: stay active for 1000ms, timeout 30s
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 1000;
+        request.timeoutMs          = 30000;
+
+        auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+        ASSERT_TRUE(response.IsSuccess());
+        EXPECT_EQ(cluster.GetRequestedStayActiveDurationMs(), 1000u);
+    }
+
+    // Second request: stay active for 500ms (less), timeout 40s (more)
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 500;
+        request.timeoutMs          = 40000;
+
+        auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+        ASSERT_TRUE(response.IsSuccess());
+        // Max stay active duration should be kept
+        EXPECT_EQ(cluster.GetRequestedStayActiveDurationMs(), 1000u);
+    }
+
+    // Third request: stay active for 2000ms (more), timeout 35s (less than current 40s)
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 2000;
+        request.timeoutMs          = 35000;
+
+        auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+        ASSERT_TRUE(response.IsSuccess());
+        // New max duration
+        EXPECT_EQ(cluster.GetRequestedStayActiveDurationMs(), 2000u);
+    }
+
+    // Verify timer firing:
+    // After 39s, timer should still be active (40s was the max timeout)
+    mMockTimer.AdvanceClock(System::Clock::Milliseconds32(39000));
+    EXPECT_TRUE(mMockTimer.IsTimerActive(&cluster));
+    EXPECT_EQ(icdDelegate.mExpiredCalled, 0u);
+
+    // After another 2s (total 41s), timer should have fired
+    mMockTimer.AdvanceClock(System::Clock::Milliseconds32(2000));
+    EXPECT_FALSE(mMockTimer.IsTimerActive(&cluster));
+    EXPECT_EQ(icdDelegate.mExpiredCalled, 1u);
+    EXPECT_FALSE(cluster.GetRequestedStayActiveDurationMs().has_value());
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestKeepActiveCommandTimeoutDomain)
+{
+    TestBridgedDeviceIcdDelegate icdDelegate;
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "icd-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                     .icdDelegate                = &icdDelegate,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    constexpr uint32_t kInvalidTimeouts[] = { 123, 100000000 };
+
+    for (uint32_t timeoutMs : kInvalidTimeouts)
+    {
+        Commands::KeepActive::Type request;
+        request.stayActiveDuration = 1000;
+        request.timeoutMs          = timeoutMs;
+
+        auto response = tester.Invoke<Commands::KeepActive::Type>(request);
+        ASSERT_FALSE(response.IsSuccess());
+        EXPECT_EQ(response.status, Status::ConstraintError);
+        EXPECT_EQ(icdDelegate.mEnterCalled, 0u);
+        EXPECT_EQ(icdDelegate.mExpiredCalled, 0u);
+    }
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestReachableChangedEvent)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "event-dev",
+                                                     .reachable = false,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    cluster.SetReachable(true);
+
+    std::optional<LogOnlyEvents::EventInformation> eventInfo = mContext.EventsGenerator().GetNextEvent();
+    ASSERT_NE(eventInfo, std::nullopt);
+    // NOLINTBEGIN(bugprone-unchecked-optional-access)
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mClusterId, Id);
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mEventId, Events::ReachableChanged::Id);
+
+    Events::ReachableChanged::DecodableType decodedEvent;
+    ASSERT_EQ(eventInfo->GetEventData(decodedEvent), CHIP_NO_ERROR);
+    EXPECT_TRUE(decodedEvent.reachableNewValue);
+    // NOLINTEND(bugprone-unchecked-optional-access)
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestLeaveEvent)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId = "event-dev",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    cluster.GenerateLeaveEvent();
+
+    std::optional<LogOnlyEvents::EventInformation> eventInfo = mContext.EventsGenerator().GetNextEvent();
+    ASSERT_NE(eventInfo, std::nullopt);
+    // NOLINTBEGIN(bugprone-unchecked-optional-access)
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mClusterId, Id);
+    EXPECT_EQ(eventInfo->eventOptions.mPath.mEventId, Events::Leave::Id);
+    // NOLINTEND(bugprone-unchecked-optional-access)
+    // This event has no fields, so no data to decode.
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestFeatureMap)
+{
+    // Test without ICD delegate
+    {
+        BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                     {
+                                                         .uniqueId = "no-icd",
+                                                     },
+                                                     {},
+                                                     {
+                                                         .parentVersionConfiguration = mMockVersionConfiguration,
+                                                         .delegate                   = mDelegate,
+                                                         .timerDelegate              = mMockTimer,
+                                                     });
+        EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+        ClusterTester tester(cluster);
+        BitFlags<Feature> featureMap;
+        EXPECT_EQ(tester.ReadAttribute(Attributes::FeatureMap::Id, featureMap), CHIP_NO_ERROR);
+        EXPECT_FALSE(featureMap.Has(Feature::kBridgedICDSupport));
+    }
+
+    // Test with ICD delegate
+    {
+        TestBridgedDeviceIcdDelegate icdDelegate;
+        BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                     {
+                                                         .uniqueId = "icd",
+                                                     },
+                                                     {},
+                                                     {
+                                                         .parentVersionConfiguration = mMockVersionConfiguration,
+                                                         .delegate                   = mDelegate,
+                                                         .timerDelegate              = mMockTimer,
+                                                         .icdDelegate                = &icdDelegate,
+                                                     });
+        EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+        ClusterTester tester(cluster);
+        BitFlags<Feature> featureMap;
+        EXPECT_EQ(tester.ReadAttribute(Attributes::FeatureMap::Id, featureMap), CHIP_NO_ERROR);
+        EXPECT_TRUE(featureMap.Has(Feature::kBridgedICDSupport));
+    }
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestSetNodeLabel)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "test-label",
+                                                     .configurationVersion = 1u,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    EXPECT_EQ(cluster.SetNodeLabel("NewLabel"_span), Status::Success);
+    EXPECT_TRUE(mDelegate.mNodeLabelChangedCalled);
+    EXPECT_EQ(mDelegate.mLastNodeLabel, "NewLabel");
+    EXPECT_EQ(cluster.GetNodeLabel(), "NewLabel");
+
+    CharSpan nodeLabel;
+    EXPECT_EQ(tester.ReadAttribute(Attributes::NodeLabel::Id, nodeLabel), CHIP_NO_ERROR);
+    EXPECT_TRUE(nodeLabel.data_equal(CharSpan::fromCharString("NewLabel")));
+
+    // Test no change
+    mDelegate.mNodeLabelChangedCalled = false;
+    mContext.ChangeListener().DirtyList().clear();
+    EXPECT_EQ(cluster.SetNodeLabel("NewLabel"_span), DataModel::ActionReturnStatus::FixedStatus::kWriteSuccessNoOp);
+    EXPECT_FALSE(mDelegate.mNodeLabelChangedCalled);
+    EXPECT_FALSE(mContext.ChangeListener().IsDirty({ kTestEndpointId, Id, Attributes::NodeLabel::Id }));
+
+    // Test set to empty/clear
+    EXPECT_EQ(cluster.SetNodeLabel({}), Status::Success);
+    EXPECT_TRUE(cluster.GetNodeLabel().empty());
+    EXPECT_EQ(tester.ReadAttribute(Attributes::NodeLabel::Id, nodeLabel), CHIP_NO_ERROR);
+    EXPECT_TRUE(nodeLabel.empty());
+
+    // Test too long
+    std::string tooLongLabel(33, 'b');
+    EXPECT_EQ(cluster.SetNodeLabel(CharSpan::fromCharString(tooLongLabel.c_str())), Status::ConstraintError);
+    EXPECT_TRUE(cluster.GetNodeLabel().empty()); // Should not have changed
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestSetNodeLabelEmpty)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "label-test",
+                                                     .nodeLabel = "Initial",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+
+    // Test setting to empty
+    EXPECT_EQ(cluster.SetNodeLabel(""_span), Status::Success);
+    EXPECT_EQ(cluster.GetNodeLabel(), "");
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestSetConfigurationVersion)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "test-cfg-ver",
+                                                     .configurationVersion = 1u,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    mMockVersionConfiguration.mVersion = 0;
+    EXPECT_EQ(cluster.IncreaseConfigurationVersion(), CHIP_NO_ERROR);
+    EXPECT_EQ(cluster.GetConfigurationVersion(), 2u);  // we started with 1
+    EXPECT_EQ(mMockVersionConfiguration.mVersion, 1u); // parent is also increased
+
+    uint32_t configVersion;
+    EXPECT_EQ(tester.ReadAttribute(Attributes::ConfigurationVersion::Id, configVersion), CHIP_NO_ERROR);
+    EXPECT_EQ(configVersion, 2u);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestAcceptedCommands)
+{
+    // Without ICD support
+    {
+        BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                     {
+                                                         .uniqueId = "no-icd",
+                                                     },
+                                                     {},
+                                                     {
+                                                         .parentVersionConfiguration = mMockVersionConfiguration,
+                                                         .delegate                   = mDelegate,
+                                                         .timerDelegate              = mMockTimer,
+                                                     });
+
+        ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> builder;
+        EXPECT_EQ(cluster.AcceptedCommands(cluster.GetPaths()[0], builder), CHIP_NO_ERROR);
+        EXPECT_EQ(builder.TakeBuffer().size(), 0u);
+    }
+
+    // With ICD support
+    {
+        TestBridgedDeviceIcdDelegate icdDelegate;
+        BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                     {
+                                                         .uniqueId = "icd",
+                                                     },
+                                                     {},
+                                                     {
+                                                         .parentVersionConfiguration = mMockVersionConfiguration,
+                                                         .delegate                   = mDelegate,
+                                                         .timerDelegate              = mMockTimer,
+                                                         .icdDelegate                = &icdDelegate,
+                                                     });
+
+        ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> builder;
+        EXPECT_EQ(cluster.AcceptedCommands(cluster.GetPaths()[0], builder), CHIP_NO_ERROR);
+        EXPECT_EQ(builder.TakeBuffer().size(), 1u);
+    }
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestReachableChangedSuppression)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "reachable-test",
+                                                     .reachable = true,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    // Setting it to same value should NOT generate event
+    cluster.SetReachable(true);
+    EXPECT_EQ(mContext.EventsGenerator().GetNextEvent(), std::nullopt);
+
+    // Setting it to different value SHOULD generate event
+    cluster.SetReachable(false);
+    EXPECT_NE(mContext.EventsGenerator().GetNextEvent(), std::nullopt);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestWriteNodeLabel)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "test-unique-id",
+                                                     .configurationVersion = 1u,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    EXPECT_EQ(tester.WriteAttribute(Attributes::NodeLabel::Id, "WrittenLabel"_span), CHIP_NO_ERROR);
+    EXPECT_TRUE(mDelegate.mNodeLabelChangedCalled);
+    EXPECT_EQ(mDelegate.mLastNodeLabel, "WrittenLabel");
+    EXPECT_EQ(cluster.GetNodeLabel(), "WrittenLabel");
+
+    // Test max length
+    std::string longLabel(32, 'a');
+    EXPECT_EQ(tester.WriteAttribute(Attributes::NodeLabel::Id, CharSpan::fromCharString(longLabel.c_str())), CHIP_NO_ERROR);
+    EXPECT_EQ(cluster.GetNodeLabel(), longLabel);
+
+    // Test too long
+    std::string tooLongLabel(33, 'b');
+    EXPECT_EQ(tester.WriteAttribute(Attributes::NodeLabel::Id, CharSpan::fromCharString(tooLongLabel.c_str())),
+              Status::ConstraintError);
+    EXPECT_EQ(cluster.GetNodeLabel(), longLabel); // Should not have changed
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestWriteConfigurationVersion)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId             = "test-unique-id",
+                                                     .configurationVersion = 1u,
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+    ClusterTester tester(cluster);
+
+    EXPECT_EQ(tester.WriteAttribute<uint32_t>(Attributes::ConfigurationVersion::Id, 2u), Status::UnsupportedWrite);
+    EXPECT_EQ(cluster.GetConfigurationVersion(), 1u);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestSetNodeLabelDelegateError)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "test-label",
+                                                     .nodeLabel = "Initial",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    // Set delegate to return error
+    mDelegate.mReturnStatus = Status::ConstraintError;
+
+    EXPECT_EQ(cluster.SetNodeLabel("NewLabel"_span), Status::ConstraintError);
+    EXPECT_TRUE(mDelegate.mNodeLabelChangedCalled);
+    EXPECT_EQ(cluster.GetNodeLabel(), "Initial"); // Should NOT have changed
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestNodeLabelPersistence)
+{
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "test-persistence",
+                                                     .nodeLabel = "Initial",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    // Set new label
+    EXPECT_EQ(cluster.SetNodeLabel("PersistentLabel"_span), Status::Success);
+
+    // Verify it is in persistence
+    AttributePersistence persistence(mContext.Get().attributeStorage);
+    Storage::String<32> storedLabel;
+    EXPECT_TRUE(persistence.LoadString({ kTestEndpointId, Id, Attributes::NodeLabel::Id }, storedLabel));
+    EXPECT_TRUE(storedLabel.Content().data_equal("PersistentLabel"_span));
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestBasicInformationClusterProxy)
+{
+    BasicInformationCluster basicInfo(BasicInformationCluster::OptionalAttributesSet(), mBasicInfoContext);
+
+    // Initial value in our mock is 10
+    EXPECT_EQ(mMockConfigManager.mConfigurationVersion, 10u);
+    EXPECT_EQ(mMockConfigManager.mStoreCalled, 0u);
+
+    BasicInformationClusterProxy proxy(basicInfo);
+    EXPECT_EQ(proxy.IncreaseConfigurationVersion(), CHIP_NO_ERROR);
+
+    EXPECT_EQ(mMockConfigManager.mConfigurationVersion, 11u);
+    EXPECT_EQ(mMockConfigManager.mStoreCalled, 1u);
+
+    // Test failure
+    mMockConfigManager.mReturnError = CHIP_ERROR_INTERNAL;
+    EXPECT_EQ(proxy.IncreaseConfigurationVersion(), CHIP_ERROR_INTERNAL);
+    EXPECT_EQ(mMockConfigManager.mConfigurationVersion, 11u);
+    EXPECT_EQ(mMockConfigManager.mStoreCalled, 1u);
+}
+
+TEST_F(TestBridgedDeviceBasicInformationCluster, TestStartupPersistence)
+{
+    // Prime persistence with a value
+    {
+        AttributePersistence persistence(mContext.AttributePersistenceProvider());
+        Storage::String<32> storedLabel;
+        storedLabel.SetContent("StoredLabel"_span);
+        EXPECT_EQ(persistence.StoreString({ kTestEndpointId, Id, Attributes::NodeLabel::Id }, storedLabel), CHIP_NO_ERROR);
+    }
+
+    BridgedDeviceBasicInformationCluster cluster(kTestEndpointId,
+                                                 {
+                                                     .uniqueId  = "test-startup",
+                                                     .nodeLabel = "ConstructorLabel",
+                                                 },
+                                                 {},
+                                                 {
+                                                     .parentVersionConfiguration = mMockVersionConfiguration,
+                                                     .delegate                   = mDelegate,
+                                                     .timerDelegate              = mMockTimer,
+                                                 });
+
+    // Startup should load from persistence
+    EXPECT_EQ(cluster.Startup(mContext.Get()), CHIP_NO_ERROR);
+
+    // Verify it was loaded
+    EXPECT_EQ(cluster.GetNodeLabel(), "StoredLabel");
+
+    // Delegate should have been called because stored value != constructor value
+    EXPECT_TRUE(mDelegate.mNodeLabelChangedCalled);
+    EXPECT_EQ(mDelegate.mLastNodeLabel, "StoredLabel");
+}
+
+} // namespace
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.cpp b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.cpp
index c1ba7b90a7f..3c8ee63d6d3 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.cpp
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.cpp
@@ -52,7 +52,7 @@ CHIP_ERROR CameraAvSettingsUserLevelManagementCluster::Startup(ServerClusterCont
     ReturnErrorOnFailure(DefaultServerCluster::Startup(context));
 
     mLogic.SetMarkDirtyCallback([this](AttributeId attributeId) { MarkAttributeDirty(attributeId); });
-    return mLogic.Startup();
+    return mLogic.Startup(context.attributeStorage);
 }
 
 DataModel::ActionReturnStatus
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h
index 67ea9743afa..a4df375a857 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h
@@ -190,7 +190,8 @@ class CameraAvSettingsUserLevelManagementCluster : public DefaultServerCluster
      * called by the interaction model at the appropriate times.
      * @param aEndpointId       The endpoint on which this cluster exists. This must match the zap configuration.
      * @param aFeatures         The bitflags value that identifies which features are supported by this instance.
-
+     * @param aMaxPresets       The maximum number of MPTZ presets supported.
+     *
      * Note: the caller must ensure that the delegate lives throughout the instance's lifetime.
      */
     CameraAvSettingsUserLevelManagementCluster(EndpointId aEndpointId,
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.cpp b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.cpp
index d4c6f551703..b653a98a84e 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.cpp
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.cpp
@@ -21,7 +21,6 @@
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h>
 #include <app/persistence/AttributePersistenceProvider.h>
-#include <app/persistence/AttributePersistenceProviderInstance.h>
 #include <app/reporting/reporting.h>
 #include <app/server-cluster/AttributeListBuilder.h>
 #include <app/util/util.h>
@@ -51,8 +50,9 @@ CameraAvSettingsUserLevelMgmtServerLogic::CameraAvSettingsUserLevelMgmtServerLog
 
 CameraAvSettingsUserLevelMgmtServerLogic::~CameraAvSettingsUserLevelMgmtServerLogic() {}
 
-CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::Startup()
+CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::Startup(AttributePersistenceProvider & aAttributePersistenceProvider)
 {
+    mAttributePersistenceProvider = &aAttributePersistenceProvider;
     ChipLogProgress(Zcl, "CameraAvSettingsUserLevelManagement: Startup");
     // Make sure mandated Features are set
     //
@@ -139,6 +139,7 @@ void CameraAvSettingsUserLevelMgmtServerLogic::MarkDirty(AttributeId aAttributeI
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreMPTZPosition(
     const CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & mptzPosition)
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     uint8_t buffer[kMptzPositionStructMaxSerializedSize];
     MutableByteSpan bufferSpan(buffer);
     TLV::TLVWriter writer;
@@ -148,17 +149,18 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreMPTZPosition(
 
     auto path = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::MPTZPosition::Id);
     bufferSpan.reduce_size(writer.GetLengthWritten());
-    return GetAttributePersistenceProvider()->WriteValue(path, bufferSpan);
+    return mAttributePersistenceProvider->WriteValue(path, bufferSpan);
 }
 
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadMPTZPosition(
     CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & mptzPosition)
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     uint8_t buffer[kMptzPositionStructMaxSerializedSize];
     MutableByteSpan bufferSpan(buffer);
 
     auto path = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::MPTZPosition::Id);
-    ReturnErrorOnFailure(GetAttributePersistenceProvider()->ReadValue(path, bufferSpan));
+    ReturnErrorOnFailure(mAttributePersistenceProvider->ReadValue(path, bufferSpan));
 
     TLV::TLVReader reader;
 
@@ -171,6 +173,7 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadMPTZPosition(
 
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreMPTZPresets()
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     Platform::ScopedMemoryBuffer<uint8_t> presets;
     MutableByteSpan bufferSpan;
     size_t maxBufferSize = static_cast<size_t>(kMaxMPTZPresetStructSerializedSize * mMaxPresets);
@@ -205,13 +208,14 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreMPTZPresets()
 
     auto path = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::MPTZPresets::Id);
     bufferSpan.reduce_size(writer.GetLengthWritten());
-    ReturnErrorOnFailure(GetAttributePersistenceProvider()->WriteValue(path, bufferSpan));
+    ReturnErrorOnFailure(mAttributePersistenceProvider->WriteValue(path, bufferSpan));
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadMPTZPresets()
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     Platform::ScopedMemoryBuffer<uint8_t> presets;
     MutableByteSpan bufferSpan;
     size_t maxBufferSize = static_cast<size_t>(kMaxMPTZPresetStructSerializedSize * mMaxPresets);
@@ -223,7 +227,7 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadMPTZPresets()
     bufferSpan = MutableByteSpan{ presets.Get(), maxBufferSize };
 
     auto path      = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::MPTZPresets::Id);
-    CHIP_ERROR err = GetAttributePersistenceProvider()->ReadValue(path, bufferSpan);
+    CHIP_ERROR err = mAttributePersistenceProvider->ReadValue(path, bufferSpan);
 
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
@@ -263,6 +267,7 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadMPTZPresets()
 
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreDPTZStreams()
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     uint8_t buffer[kMaxDPTZStreamsSerializedSize];
     MutableByteSpan bufferSpan(buffer);
     TLV::TLVWriter writer;
@@ -279,19 +284,20 @@ CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::StoreDPTZStreams()
 
     auto path = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::DPTZStreams::Id);
     bufferSpan.reduce_size(writer.GetLengthWritten());
-    ReturnErrorOnFailure(GetAttributePersistenceProvider()->WriteValue(path, bufferSpan));
+    ReturnErrorOnFailure(mAttributePersistenceProvider->WriteValue(path, bufferSpan));
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR CameraAvSettingsUserLevelMgmtServerLogic::LoadDPTZStreams()
 {
+    VerifyOrReturnError(mAttributePersistenceProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
     uint8_t buffer[kMaxDPTZStreamsSerializedSize];
     MutableByteSpan bufferSpan(buffer);
 
     auto path = ConcreteAttributePath(mEndpointId, CameraAvSettingsUserLevelManagement::Id, Attributes::DPTZStreams::Id);
 
-    CHIP_ERROR err = GetAttributePersistenceProvider()->ReadValue(path, bufferSpan);
+    CHIP_ERROR err = mAttributePersistenceProvider->ReadValue(path, bufferSpan);
 
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.h b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.h
index 905abad8ed6..976fedb2a86 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.h
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementLogic.h
@@ -25,6 +25,7 @@
 #include <app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementConstants.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
 #include <app/data-model-provider/MetadataTypes.h>
+#include <app/persistence/AttributePersistenceProvider.h>
 #include <lib/support/ReadOnlyBuffer.h>
 #include <protocols/interaction_model/StatusCode.h>
 
@@ -93,7 +94,7 @@ class CameraAvSettingsUserLevelMgmtServerLogic : public CameraAvSettingsUserLeve
 
     CHIP_ERROR Init() { return CHIP_NO_ERROR; }
 
-    CHIP_ERROR Startup();
+    CHIP_ERROR Startup(AttributePersistenceProvider & aAttributePersistenceProvider);
 
     // Handle any dynamic cleanup required prior to the destructor being called on an app shutdown.  To be invoked by
     // an app as part of its own shutdown sequence and prior to the destruction of the app/delegate.
@@ -215,7 +216,8 @@ class CameraAvSettingsUserLevelMgmtServerLogic : public CameraAvSettingsUserLeve
     bool IsMoving() const { return mMovementState == CameraAvSettingsUserLevelManagement::PhysicalMovementEnum::kMoving; }
 
 private:
-    CameraAvSettingsUserLevelManagementDelegate * mDelegate = nullptr;
+    CameraAvSettingsUserLevelManagementDelegate * mDelegate      = nullptr;
+    AttributePersistenceProvider * mAttributePersistenceProvider = nullptr;
     MarkDirtyCallback mMarkDirtyCallback;
 
     // Holding variables for values subject to successful physical movement
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/app_config_dependent_sources.cmake b/src/app/clusters/camera-av-settings-user-level-management-server/app_config_dependent_sources.cmake
index 928d0706c13..e82f2046695 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/app_config_dependent_sources.cmake
@@ -13,6 +13,13 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
+)
+
+# These are the things that BUILD.gn dependencies would pull
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
@@ -20,5 +27,4 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CameraAvSettingsUserLevelManagementCluster.h"
     "${CLUSTER_DIR}/CameraAvSettingsUserLevelManagementLogic.cpp"
     "${CLUSTER_DIR}/CameraAvSettingsUserLevelManagementLogic.h"   
-    "${CLUSTER_DIR}/CodegenIntegration.cpp"    
 )
diff --git a/src/app/clusters/camera-av-settings-user-level-management-server/tests/TestCameraAvSettingsUserLevelManagementCluster.cpp b/src/app/clusters/camera-av-settings-user-level-management-server/tests/TestCameraAvSettingsUserLevelManagementCluster.cpp
index 061d380b325..146088cd7a3 100644
--- a/src/app/clusters/camera-av-settings-user-level-management-server/tests/TestCameraAvSettingsUserLevelManagementCluster.cpp
+++ b/src/app/clusters/camera-av-settings-user-level-management-server/tests/TestCameraAvSettingsUserLevelManagementCluster.cpp
@@ -20,7 +20,6 @@
 #include <app/clusters/camera-av-settings-user-level-management-server/CameraAvSettingsUserLevelManagementCluster.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model/Decode.h>
-#include <app/persistence/AttributePersistenceProviderInstance.h>
 #include <app/server-cluster/DefaultServerCluster.h>
 #include <app/server-cluster/testing/ClusterTester.h>
 #include <app/server-cluster/testing/TestServerClusterContext.h>
@@ -108,22 +107,15 @@ struct TestCameraAvSettingsUserLevelManagementCluster : public ::testing::Test
 
     void SetUp() override
     {
-        VerifyOrDie(mPersistenceProvider.Init(&mClusterTester.GetServerClusterContext().storage) == CHIP_NO_ERROR);
-        SetAttributePersistenceProvider(&mPersistenceProvider);
         mServer.SetDelegate(&mMockDelegate);
         EXPECT_EQ(mServer.Startup(mClusterTester.GetServerClusterContext()), CHIP_NO_ERROR);
     }
 
-    void TearDown() override
-    {
-        SetAttributePersistenceProvider(nullptr);
-        mServer.Shutdown(ClusterShutdownType::kClusterShutdown);
-    }
+    void TearDown() override { mServer.Shutdown(ClusterShutdownType::kClusterShutdown); }
 
     MockCameraAvSettingsUserLevelManagementDelegate mMockDelegate;
     CameraAvSettingsUserLevelManagementCluster mServer;
     ClusterTester mClusterTester;
-    DefaultAttributePersistenceProvider mPersistenceProvider;
 };
 
 TEST_F(TestCameraAvSettingsUserLevelManagementCluster, TestAttributes)
diff --git a/src/app/clusters/chime-server/app_config_dependent_sources.cmake b/src/app/clusters/chime-server/app_config_dependent_sources.cmake
index d8a6cc77b70..ee9cc7b38db 100644
--- a/src/app/clusters/chime-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/chime-server/app_config_dependent_sources.cmake
@@ -21,10 +21,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/chime-server.h"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/ChimeCluster.cpp"
-    "${CLUSTER_DIR}/ChimeCluster.h"
-)
\ No newline at end of file
diff --git a/src/app/clusters/closure-control-server/closure-control-server.cpp b/src/app/clusters/closure-control-server/ClosureControlCluster.cpp
similarity index 98%
rename from src/app/clusters/closure-control-server/closure-control-server.cpp
rename to src/app/clusters/closure-control-server/ClosureControlCluster.cpp
index 88ef0a6925b..898d0ee33f6 100644
--- a/src/app/clusters/closure-control-server/closure-control-server.cpp
+++ b/src/app/clusters/closure-control-server/ClosureControlCluster.cpp
@@ -19,7 +19,7 @@
 #include <app/CommandHandlerInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/InteractionModelEngine.h>
-#include <app/clusters/closure-control-server/closure-control-server.h>
+#include <app/clusters/closure-control-server/ClosureControlCluster.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/logging/CHIPLogging.h>
 
diff --git a/src/app/clusters/closure-control-server/ClosureControlCluster.h b/src/app/clusters/closure-control-server/ClosureControlCluster.h
new file mode 100644
index 00000000000..4c43034d536
--- /dev/null
+++ b/src/app/clusters/closure-control-server/ClosureControlCluster.h
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2025 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 <app/AttributeAccessInterface.h>
+#include <app/CommandHandlerInterface.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterLogic.h>
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/**
+ * @brief Closure Control cluster interface implementation
+ *        Applications should instantiate and init one Interface per endpoint
+ *
+ */
+class Interface : public AttributeAccessInterface, public CommandHandlerInterface
+{
+public:
+    Interface(EndpointId endpoint, ClusterLogic & clusterLogic) :
+        AttributeAccessInterface(Optional<EndpointId>(endpoint), Id), CommandHandlerInterface(Optional<EndpointId>(endpoint), Id),
+        mClusterLogic(clusterLogic)
+    {}
+
+    virtual ~Interface() = default;
+
+    // AttributeAccessInterface
+    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+
+    // CommandHandlerInterface
+    void InvokeCommand(HandlerContext & handlerContext) override;
+
+    /**
+     * @brief This function registers attribute access and command handler.
+     *
+     * @return CHIP_NO_ERROR when succesfully initialized.
+     *         Aborts if registration fails.
+     */
+    CHIP_ERROR Init();
+
+    /**
+     * @brief This function registers attribute access and command handler.
+     *
+     * @return CHIP_NO_ERROR when succesfully initialized.
+     *         Aborts if registration fails.
+     */
+    CHIP_ERROR Shutdown();
+
+private:
+    ClusterLogic & mClusterLogic;
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/closure-control-server/ClosureControlClusterDelegate.h b/src/app/clusters/closure-control-server/ClosureControlClusterDelegate.h
new file mode 100644
index 00000000000..a14e2e3b4f2
--- /dev/null
+++ b/src/app/clusters/closure-control-server/ClosureControlClusterDelegate.h
@@ -0,0 +1,99 @@
+/**
+ *
+ *    Copyright (c) 2025 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-common/zap-generated/cluster-enums.h>
+#include <protocols/interaction_model/StatusCode.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/** @brief Defines methods for implementing application-specific logic for the Closure Control Cluster.
+ */
+class DelegateBase
+{
+public:
+    DelegateBase()          = default;
+    virtual ~DelegateBase() = default;
+
+    /**
+     * @brief This function handles Stop command implementaion.
+     *
+     * @return Success when closure succesfully handles stop.
+     *         Error when stop fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleStopCommand() = 0;
+
+    /**
+     * @brief This function handles MoveTo command implementaion.
+     *
+     * @param [in] position Target position to be set
+     * @param [in] latch Target Latch to be set
+     * @param [in] speed Target speed to be set
+     *
+     * @return Success when closure succesfully handles motion.
+     *         Error when motion fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleMoveToCommand(const Optional<TargetPositionEnum> & position,
+                                                                    const Optional<bool> & latch,
+                                                                    const Optional<Globals::ThreeLevelAutoEnum> & speed) = 0;
+
+    /**
+     * @brief This function handles Calibrate command implementaion.
+     *
+     * @return Success when closure succesfully handles calibration.
+     *         Error when calibration fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleCalibrateCommand() = 0;
+
+    /**
+     * @brief Checks whether the closure can move (as opposed to still needing pre-motion stages to complete).
+     *
+     * @return true if closure is ready to move
+     *         false if closure is not ready to move
+     */
+    virtual bool IsReadyToMove() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for calibration.
+     *
+     * @return Time required for calibration action.
+     */
+    virtual ElapsedS GetCalibrationCountdownTime() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for Motion.
+     *
+     * @return Time required for Motion action.
+     */
+    virtual ElapsedS GetMovingCountdownTime() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for pre-stage before start of motion.
+     *
+     * @return Time required for Motion action.
+     */
+    virtual ElapsedS GetWaitingForMotionCountdownTime() = 0;
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp b/src/app/clusters/closure-control-server/ClosureControlClusterLogic.cpp
similarity index 99%
rename from src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp
rename to src/app/clusters/closure-control-server/ClosureControlClusterLogic.cpp
index 3b94e39d36e..85394b95854 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp
+++ b/src/app/clusters/closure-control-server/ClosureControlClusterLogic.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/clusters/closure-control-server/closure-control-cluster-logic.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterLogic.h>
 #include <clusters/ClosureControl/Metadata.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/LockTracker.h>
diff --git a/src/app/clusters/closure-control-server/ClosureControlClusterLogic.h b/src/app/clusters/closure-control-server/ClosureControlClusterLogic.h
new file mode 100644
index 00000000000..4a1e626b51c
--- /dev/null
+++ b/src/app/clusters/closure-control-server/ClosureControlClusterLogic.h
@@ -0,0 +1,439 @@
+/**
+ *
+ *    Copyright (c) 2025 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 Cross-platform API to handle cluster-specific logic for the Closure Control cluster on a single endpoint.
+ */
+
+#pragma once
+
+#include <app-common/zap-generated/cluster-enums.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/cluster-building-blocks/QuieterReporting.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterDelegate.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterMatterContext.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterObjects.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/BitFlags.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/**
+ * @brief Closure Control optional attribute enum class
+ */
+enum class OptionalAttributeEnum : uint32_t
+{
+    kCountdownTime = 0x1
+};
+// As per the spec, the maximum allowed CurrentErrorList size is 10.
+constexpr int kCurrentErrorListMaxSize = 10;
+
+/**
+ * @brief Structure is used to configure and validate the Cluster configuration.
+ *        Validates if the feature map, attributes and commands configuration is valid.
+ */
+struct ClusterConformance
+{
+public:
+    BitFlags<Feature> & FeatureMap() { return mFeatureMap; }
+    const BitFlags<Feature> & FeatureMap() const { return mFeatureMap; }
+
+    BitFlags<OptionalAttributeEnum> & OptionalAttributes() { return mOptionalAttributes; }
+    const BitFlags<OptionalAttributeEnum> & OptionalAttributes() const { return mOptionalAttributes; }
+
+    inline bool HasFeature(Feature aFeature) const { return mFeatureMap.Has(aFeature); }
+
+    /**
+     * @brief Function determines if Cluster conformance is valid
+     *
+     *        The function executes these checks in order to validate the conformance
+     *        1. Check if either Positioning or MotionLatching is supported. If neither are enabled, returns false.
+     *        2. If Speed is enabled, checks that Positioning is enabled and Instantaneous is disabled. Returns false otherwise.
+     *        3. If Ventilation, pedestrian or calibration is enabled, Positioning must be enabled. Return false otherwise.
+     *
+     * @return true, the cluster confirmance is valid
+     *         false, otherwise
+     */
+    bool Valid() const
+    {
+        // Positioning or Matching must be enabled
+        VerifyOrReturnValue(HasFeature(Feature::kPositioning) || HasFeature(Feature::kMotionLatching), false,
+                            ChipLogError(AppServer, "Validation failed: Neither Positioning nor MotionLatching is enabled."));
+
+        // If Speed is enabled, Positioning shall be enabled and Instantaneous shall be disabled.
+        if (HasFeature(Feature::kSpeed))
+        {
+            VerifyOrReturnValue(
+                HasFeature(Feature::kPositioning) && !HasFeature(Feature::kInstantaneous), false,
+                ChipLogError(AppServer, "Validation failed: Speed requires Positioning enabled and Instantaneous disabled."));
+        }
+
+        if (HasFeature(Feature::kVentilation) || HasFeature(Feature::kPedestrian) || HasFeature(Feature::kCalibration))
+        {
+            VerifyOrReturnValue(
+                HasFeature(Feature::kPositioning), false,
+                ChipLogError(AppServer,
+                             "Validation failed: Ventilation, Pedestrian, or Calibration requires Positioning enabled."));
+        }
+
+        return true;
+    }
+
+private:
+    BitFlags<Feature> mFeatureMap;
+    BitFlags<OptionalAttributeEnum> mOptionalAttributes;
+};
+
+/**
+ * @brief Struct to store the current cluster state
+ */
+struct ClusterState
+{
+    ClusterState()
+    {
+        // Configure CountdownTime Quiet Reporting strategies
+        // - When it changes from 0 to any other value and vice versa
+        // - When it increases
+        // - When it changes from null to any other value and vice versa (default support)
+        mCountdownTime.policy()
+            .Set(QuieterReportingPolicyEnum::kMarkDirtyOnIncrement)
+            .Set(QuieterReportingPolicyEnum::kMarkDirtyOnChangeToFromZero);
+    };
+
+    QuieterReportingAttribute<ElapsedS> mCountdownTime{ DataModel::NullNullable };
+    MainStateEnum mMainState                                             = MainStateEnum::kUnknownEnumValue;
+    DataModel::Nullable<GenericOverallCurrentState> mOverallCurrentState = DataModel::NullNullable;
+    DataModel::Nullable<GenericOverallTargetState> mOverallTargetState   = DataModel::NullNullable;
+    BitFlags<LatchControlModesBitmap> mLatchControlModes;
+    ClosureErrorEnum mCurrentErrorList[kCurrentErrorListMaxSize] = {};
+
+    // The current error count is used to track the number of errors in the CurrentErrorList.
+    size_t mCurrentErrorCount = 0;
+};
+
+/**
+ * @brief Struct to store the cluster initialization parameters
+ */
+struct ClusterInitParameters
+{
+    MainStateEnum mMainState                                             = MainStateEnum::kStopped;
+    DataModel::Nullable<GenericOverallCurrentState> mOverallCurrentState = DataModel::NullNullable;
+};
+
+/**
+ * @brief Class containing the cluster business logic
+ *
+ */
+class ClusterLogic
+{
+public:
+    // Instantiates a ClusterLogic class. The caller maintains ownership of the driver and the context, but provides them for use by
+    // the ClusterLogic class.
+    ClusterLogic(DelegateBase & delegate, MatterContext & matterContext) : mDelegate(delegate), mMatterContext(matterContext) {}
+
+    ~ClusterLogic() = default;
+
+    const ClusterConformance & GetConformance() const { return mConformance; }
+    const ClusterState & GetState() const { return mState; }
+
+    /**
+     * @brief Initializes the cluster logic
+     *        Validates that the provided conformance is spec compliant.
+     *        Set the initPrasams in their respective attributes.
+     *
+     * @param[in] conformance
+     * @param[in] initParams
+     *
+     * @return CHIP_ERROR_INCORRECT_STATE if the class has already been initialized.
+     *         Set fucntion Specific errors, if set of initParams failed.
+     *         CHIP_NO_ERROR on successful Initialization.
+     */
+    CHIP_ERROR Init(const ClusterConformance & conformance, const ClusterInitParameters & initParams);
+
+    // All Get functions
+    // Return CHIP_ERROR_INCORRECT_STATE if the class has not been initialized.
+    // Return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if the attribute is not supported by the conformance.
+    // Otherwise return CHIP_NO_ERROR and set the input parameter value to the current cluster state value
+
+    CHIP_ERROR GetCountdownTime(DataModel::Nullable<ElapsedS> & countdownTime);
+    CHIP_ERROR GetMainState(MainStateEnum & mainState);
+    CHIP_ERROR GetOverallCurrentState(DataModel::Nullable<GenericOverallCurrentState> & overallCurrentState);
+    CHIP_ERROR GetOverallTargetState(DataModel::Nullable<GenericOverallTargetState> & overallTarget);
+    CHIP_ERROR GetLatchControlModes(BitFlags<LatchControlModesBitmap> & latchControlModes);
+    CHIP_ERROR GetFeatureMap(BitFlags<Feature> & featureMap);
+    CHIP_ERROR GetClusterRevision(Attributes::ClusterRevision::TypeInfo::Type & clusterRevision);
+
+    /**
+     * @brief Gets the current error list.
+     *        This method is used to retrieve the current error list.
+     *        The outputSpan must initially be of size kCurrentErrorListMaxSize and will be resized to the correct size for the
+     * list.
+     * @param[out] outputSpan The span to fill with the current error list.
+     *
+     * @return CHIP_NO_ERROR if the retrieval was successful.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     *         CHIP_ERROR_BUFFER_TOO_SMALL if the outputSpan size is not equal to kCurrentErrorListMaxSize.
+     */
+    CHIP_ERROR GetCurrentErrorList(Span<ClosureErrorEnum> & outputSpan);
+
+    /**
+     * @brief Reads the CurrentErrorList attribute.
+     *        This method is used to read the CurrentErrorList attribute and encode it using the provided encoder.
+     *
+     * @param[in] encoder The encoder to use for encoding the CurrentErrorList attribute.
+     *
+     * @return CHIP_NO_ERROR if the read was successful.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     */
+    CHIP_ERROR ReadCurrentErrorListAttribute(const AttributeValueEncoder::ListEncodeHelper & encoder);
+
+    /**
+     * @brief Set SetOverallCurrentState.
+     *
+     * @param[in] overallCurrentState SetOverallCurrentState Position, Latch and Speed.
+     *
+     * @return CHIP_NO_ERROR if set was successful.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if feature is not supported.
+     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
+     */
+    CHIP_ERROR SetOverallCurrentState(const DataModel::Nullable<GenericOverallCurrentState> & overallCurrentState);
+
+    /**
+     * @brief Set OverallTargetState.
+     *
+     * @param[in] overallTarget OverallTargetState Position, Latch and Speed.
+     *
+     * @return CHIP_NO_ERROR if set was successful.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if feature is not supported.
+     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
+     */
+    CHIP_ERROR SetOverallTargetState(const DataModel::Nullable<GenericOverallTargetState> & overallTarget);
+
+    /**
+     * @brief Sets the main state of the cluster.
+     *        This method also generates the EngageStateChanged event based on MainState transition.
+     *        This method also updates the CountdownTime attribute based on MainState
+     *
+     * @param[in] mainState - The new main state to be set.
+     *
+     * @return CHIP_NO_ERROR if the main state is set successfully.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if new MainState is not supported.
+     *         CHIP_ERROR_INCORRECT_STATE if the transition to new MainState is not supported.
+     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
+     */
+    CHIP_ERROR SetMainState(MainStateEnum mainState);
+
+    /**
+     * @brief Sets the latch control modes for the closure control cluster.
+     *        This method updates the latch control modes using the provided bit flags.
+     *
+     * @param[in] latchControlModes  Reference to a BitFlags object representing the desired latch control modes.
+     *
+     * @return CHIP_ERROR Returns CHIP_NO_ERROR on success, or an appropriate error code on failure.
+     */
+    CHIP_ERROR SetLatchControlModes(const BitFlags<LatchControlModesBitmap> & latchControlModes);
+
+    /**
+     * @brief Triggers an update to report a new countdown time from application.
+     *        This method should be called whenever the application needs to update the countdown time.
+     *
+     * @param[in] countdownTime - Updated countdown time to be reported.
+     *
+     * @return CHIP_NO_ERROR if the countdown time is set successfully.
+     *         Returns an appropriate error code if the countdown time update fails
+     */
+    inline CHIP_ERROR SetCountdownTimeFromDelegate(const DataModel::Nullable<ElapsedS> & countdownTime)
+    {
+        return SetCountdownTime(countdownTime, true);
+    }
+
+    /**
+     * @brief Adds error to current error list.
+     *
+     * @param[in] error The error to be added to the current error list.
+     *
+     * @return CHIP_NO_ERROR if the error was added successfully.
+     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
+     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
+     */
+    CHIP_ERROR AddErrorToCurrentErrorList(ClosureErrorEnum error);
+
+    /**
+     * @brief Clears the current error list.
+     *        This method should be called whenever the current error list needs to be reset.
+     */
+    void ClearCurrentErrorList();
+
+    /**
+     *  @brief Calls delegate HandleStopCommand function after validating MainState, parameters and conformance.
+     *
+     *  @return Exits if the cluster is not initialized.
+     *          Success if the Stop command not supported from present Mainstate.
+     *          UnsupportedCommand if Instantaneous feature is supported.
+     *          Success on succesful handling or Error Otherwise
+     */
+    Protocols::InteractionModel::Status HandleStop();
+
+    /**
+     *  @brief Calls delegate HandleMoveToCommand function after validating the parameters and conformance.
+     *
+     *  @param [in] position target position
+     *  @param [in] latch Target latch
+     *  @param [in] speed Target speed
+     *
+     *  @return Exits if the cluster is not initialized.
+     *          ConstraintError if the input values are out is out of range.
+     *          InvalidInState if the MoveTo command not supported from present Mainstate.
+     *          Success on succesful handling.
+     */
+    Protocols::InteractionModel::Status HandleMoveTo(Optional<TargetPositionEnum> position, Optional<bool> latch,
+                                                     Optional<Globals::ThreeLevelAutoEnum> speed);
+
+    /**
+     *  @brief Calls delegate HandleCalibrateCommand function after validating the parameters and conformance.
+     *
+     *  @return Exits if the cluster is not initialized.
+     *          ConstraintError if the input values are out is out of range.
+     *          InvalidInState if the Calibrate command not supported from present Mainstate.
+     *          Success on succesful handling.
+     */
+    Protocols::InteractionModel::Status HandleCalibrate();
+
+    /**
+     * @brief Generates OperationalError event.
+     *        This method should be called whenever when a reportable error condition is detected
+     *
+     * @param [in] errorState current error list
+     *
+     * @return CHIP_NO_ERROR if the event is generated successfully
+     *         Returns an appropriate error code if event generation fails
+     */
+    CHIP_ERROR GenerateOperationalErrorEvent(const DataModel::List<const ClosureErrorEnum> & errorState);
+
+    /**
+     * @brief Generates MovementCompleted event.
+     *        This method should be called whenever when the overall operation ends either successfully or otherwise.
+     *
+     * @return CHIP_NO_ERROR if the event is generated successfull
+     *         CHIP_NO_ERROR if the Positioning feature is not supported.
+     *         Returns an appropriate error code if event generation fails
+     */
+    CHIP_ERROR GenerateMovementCompletedEvent();
+
+    /**
+     * @brief Generates EngageStateChanged event.
+     *        This method should be called whenever when the MainStateEnum attribute changes state to and from disengaged
+     *
+     * @param[in] EngageValue will indicate if the actuator is Engaged or Disengaged
+     *
+     * @return CHIP_NO_ERROR if the event is generated successfull
+     *         CHIP_NO_ERROR if the ManuallyOperable feature is not supported.
+     *         Returns an appropriate error code if event generation fails
+     */
+    CHIP_ERROR GenerateEngageStateChangedEvent(const bool engageValue);
+
+    /**
+     * @brief Generates EngageStateChanged event.
+     *        This method should be called whenever when the SecureState field in the OverallCurrentState attribute changes.
+     *
+     * @param[in] secureValue will indicate whether a closure is securing a space against possible unauthorized entry.
+     *
+     * @return CHIP_NO_ERROR if the event is generated successfull
+     *         CHIP_NO_ERROR if the feature conformance is not supported
+     *         Returns an appropriate error code if event generation fails.
+     */
+    CHIP_ERROR GenerateSecureStateChangedEvent(const bool secureValue);
+
+private:
+    bool mIsInitialized = false;
+    DelegateBase & mDelegate;
+    ClusterConformance mConformance;
+    ClusterState mState;
+    MatterContext & mMatterContext;
+
+    /**
+     * @brief Function validates if the requested mainState is supported by the closure.
+     *        Function validates agaisnt the FeatureMap conformance to validate support.
+     *
+     *        - Stopped, Moving, WaitingForMotion, Error and SetupRequired always return true since they are mandatory.
+     *        - Calibrating returns true if the Calibration feature is supported, false otherwise.
+     *        - Protected returns true if the Proitection feature is supported, false otherwise.
+     *        - Disengaged returns true if the ManuallyOperable feature is supported, false otherwise.
+     *        - Returns true if the requested MainState is not a known state.
+     *
+     * @param mainState requested MainState to validate
+     *
+     * @return true, if the requested MainState is supported
+     *         false, otherwise
+     */
+    bool IsSupportedMainState(MainStateEnum mainState) const;
+
+    /**
+     * @brief Function validates if the requested overallCurrentState positioning is supported by the closure.
+     *        Function validates against the FeatureMap conformance to validate support.
+     *
+     * @param positioning requested Positioning to validate
+     *
+     * @return true if the requested Positioning is supported
+     *        false, otherwise
+     */
+    bool IsSupportedOverallCurrentStatePositioning(CurrentPositionEnum positioning) const;
+
+    /**
+     * @brief Function validates if the requested OverallTargetState positioning is supported by the closure.
+     *        Function validates agaisnt the FeatureMap conformance to validate support.
+     *
+     * @param positioning requested Positioning to validate
+     *
+     * @return true if the requested Positioning is supported
+     *        false, otherwise
+     */
+    bool IsSupportedOverallTargetStatePositioning(TargetPositionEnum positioning) const;
+
+    /**
+     * @brief Updates the countdown time based on the Quiet reporting conditions of the attribute.
+     *
+     * @param fromDelegate true if the countdown time is being configured by the delegate, false otherwise
+     */
+    CHIP_ERROR SetCountdownTime(const DataModel::Nullable<ElapsedS> & countdownTime, bool fromDelegate);
+
+    /**
+     * @brief Updates the countdown time from cluster logic.
+     *        This method should be invoked whenever the cluster logic needs to update the countdown time.
+     *        This includes:
+     *         - When the tracked operation changes due to an update in the MainState attribute
+     *
+     * @param[in] countdownTime - Updated countdown time to be reported.
+     *
+     * @return CHIP_NO_ERROR if the countdown time is set successfully.
+     *         Returns an appropriate error code if the countdown time update fails
+     */
+    inline CHIP_ERROR SetCountdownTimeFromCluster(const DataModel::Nullable<ElapsedS> & countdownTime)
+    {
+        return SetCountdownTime(countdownTime, false);
+    }
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/closure-control-server/ClosureControlClusterMatterContext.h b/src/app/clusters/closure-control-server/ClosureControlClusterMatterContext.h
new file mode 100644
index 00000000000..079ca785063
--- /dev/null
+++ b/src/app/clusters/closure-control-server/ClosureControlClusterMatterContext.h
@@ -0,0 +1,67 @@
+/*
+ *
+ *    Copyright (c) 2025 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 <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/EventLogging.h>
+#include <app/reporting/reporting.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/**
+ * @brief Interface to allow interaction with interaction model and ember layers. Can be faked for unit testing.
+ */
+class MatterContext
+{
+public:
+    MatterContext(EndpointId endpointId) : mEndpointId(endpointId) {}
+    virtual ~MatterContext() = default;
+
+    virtual void MarkDirty(AttributeId attributeId)
+    {
+        MatterReportingAttributeChangeCallback(mEndpointId, Id, attributeId);
+
+        ConcreteAttributePath attributePath(mEndpointId, Id, attributeId);
+        MatterClosureControlClusterServerAttributeChangedCallback(attributePath);
+    }
+
+    template <typename EventType>
+    CHIP_ERROR GenerateEvent(EventType event)
+    {
+        EventNumber eventNumber;
+        return LogEvent(event, mEndpointId, eventNumber);
+    }
+
+    EndpointId GetEndpointId() const { return mEndpointId; }
+
+private:
+    EndpointId mEndpointId = kInvalidEndpointId;
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/closure-control-server/ClosureControlClusterObjects.h b/src/app/clusters/closure-control-server/ClosureControlClusterObjects.h
new file mode 100644
index 00000000000..9211b240717
--- /dev/null
+++ b/src/app/clusters/closure-control-server/ClosureControlClusterObjects.h
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2025 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 <app-common/zap-generated/cluster-objects.h>
+#include <lib/support/CommonIterator.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/**
+ * Structure represents the overall state of a closure control cluster derivation instance.
+ */
+struct GenericOverallCurrentState : public Structs::OverallCurrentStateStruct::Type
+{
+    GenericOverallCurrentState(Optional<DataModel::Nullable<CurrentPositionEnum>> positionValue = NullOptional,
+                               Optional<DataModel::Nullable<bool>> latchValue                   = NullOptional,
+                               Optional<Globals::ThreeLevelAutoEnum> speedValue                 = NullOptional,
+                               DataModel::Nullable<bool> secureStateValue                       = NullOptional)
+    {
+        Set(positionValue, latchValue, speedValue, secureStateValue);
+    }
+
+    GenericOverallCurrentState(const GenericOverallCurrentState & overallCurrentState) { *this = overallCurrentState; }
+
+    GenericOverallCurrentState & operator=(const GenericOverallCurrentState & overallCurrentState)
+    {
+        Set(overallCurrentState.position, overallCurrentState.latch, overallCurrentState.speed, overallCurrentState.secureState);
+        return *this;
+    }
+
+    void Set(Optional<DataModel::Nullable<CurrentPositionEnum>> positionValue = NullOptional,
+             Optional<DataModel::Nullable<bool>> latchValue                   = NullOptional,
+             Optional<Globals::ThreeLevelAutoEnum> speedValue                 = NullOptional,
+             DataModel::Nullable<bool> secureStateValue                       = NullOptional)
+    {
+        position    = positionValue;
+        latch       = latchValue;
+        speed       = speedValue;
+        secureState = secureStateValue;
+    }
+
+    bool operator==(const Structs::OverallCurrentStateStruct::Type & rhs) const
+    {
+        return position == rhs.position && latch == rhs.latch && speed == rhs.speed && secureState == rhs.secureState;
+    }
+
+    bool operator==(const GenericOverallCurrentState & rhs) const
+    {
+        return operator==(static_cast<const Structs::OverallCurrentStateStruct::Type &>(rhs));
+    }
+};
+
+/**
+ * Structure represents the overall target state of a closure control cluster derivation instance.
+ */
+struct GenericOverallTargetState : public Structs::OverallTargetStateStruct::Type
+{
+    GenericOverallTargetState(Optional<DataModel::Nullable<TargetPositionEnum>> positionValue = NullOptional,
+                              Optional<DataModel::Nullable<bool>> latchValue                  = NullOptional,
+                              Optional<Globals::ThreeLevelAutoEnum> speedValue                = NullOptional)
+    {
+        Set(positionValue, latchValue, speedValue);
+    }
+
+    GenericOverallTargetState(const GenericOverallTargetState & overallTarget) { *this = overallTarget; }
+
+    GenericOverallTargetState & operator=(const GenericOverallTargetState & overallTarget)
+    {
+        Set(overallTarget.position, overallTarget.latch, overallTarget.speed);
+        return *this;
+    }
+
+    void Set(Optional<DataModel::Nullable<TargetPositionEnum>> positionValue = NullOptional,
+             Optional<DataModel::Nullable<bool>> latchValue                  = NullOptional,
+             Optional<Globals::ThreeLevelAutoEnum> speedValue                = NullOptional)
+    {
+        position = positionValue;
+        latch    = latchValue;
+        speed    = speedValue;
+    }
+
+    bool operator==(const Structs::OverallTargetStateStruct::Type & rhs) const
+    {
+        return position == rhs.position && latch == rhs.latch && speed == rhs.speed;
+    }
+
+    bool operator==(const GenericOverallTargetState & rhs) const
+    {
+        return operator==(static_cast<const Structs::OverallTargetStateStruct::Type &>(rhs));
+    }
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/closure-control-server/app_config_dependent_sources.cmake b/src/app/clusters/closure-control-server/app_config_dependent_sources.cmake
index 6f3af2c28d2..531ffdaae4f 100644
--- a/src/app/clusters/closure-control-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/closure-control-server/app_config_dependent_sources.cmake
@@ -17,10 +17,10 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/closure-control-cluster-delegate.h"
-    "${CLUSTER_DIR}/closure-control-cluster-logic.cpp"
+    "${CLUSTER_DIR}/ClosureControlClusterLogic.cpp"
     "${CLUSTER_DIR}/closure-control-cluster-logic.h"
     "${CLUSTER_DIR}/closure-control-cluster-matter-context.h"
     "${CLUSTER_DIR}/closure-control-cluster-objects.h"
-    "${CLUSTER_DIR}/closure-control-server.cpp"
+    "${CLUSTER_DIR}/ClosureControlCluster.cpp"
     "${CLUSTER_DIR}/closure-control-server.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/closure-control-server/app_config_dependent_sources.gni b/src/app/clusters/closure-control-server/app_config_dependent_sources.gni
index c18f70d8dd5..93e40899295 100644
--- a/src/app/clusters/closure-control-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/closure-control-server/app_config_dependent_sources.gni
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 app_config_dependent_sources = [
+  "ClosureControlCluster.cpp",
+  "ClosureControlClusterLogic.cpp",
   "closure-control-cluster-delegate.h",
-  "closure-control-cluster-logic.cpp",
   "closure-control-cluster-logic.h",
   "closure-control-cluster-matter-context.h",
   "closure-control-cluster-objects.h",
-  "closure-control-server.cpp",
   "closure-control-server.h",
 ]
diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-delegate.h b/src/app/clusters/closure-control-server/closure-control-cluster-delegate.h
index a14e2e3b4f2..73a39fe341d 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-delegate.h
+++ b/src/app/clusters/closure-control-server/closure-control-cluster-delegate.h
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2025 Project CHIP Authors
+ *    Copyright (c) 2026 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,83 +17,4 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-enums.h>
-#include <protocols/interaction_model/StatusCode.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ClosureControl {
-
-/** @brief Defines methods for implementing application-specific logic for the Closure Control Cluster.
- */
-class DelegateBase
-{
-public:
-    DelegateBase()          = default;
-    virtual ~DelegateBase() = default;
-
-    /**
-     * @brief This function handles Stop command implementaion.
-     *
-     * @return Success when closure succesfully handles stop.
-     *         Error when stop fails.
-     */
-    virtual Protocols::InteractionModel::Status HandleStopCommand() = 0;
-
-    /**
-     * @brief This function handles MoveTo command implementaion.
-     *
-     * @param [in] position Target position to be set
-     * @param [in] latch Target Latch to be set
-     * @param [in] speed Target speed to be set
-     *
-     * @return Success when closure succesfully handles motion.
-     *         Error when motion fails.
-     */
-    virtual Protocols::InteractionModel::Status HandleMoveToCommand(const Optional<TargetPositionEnum> & position,
-                                                                    const Optional<bool> & latch,
-                                                                    const Optional<Globals::ThreeLevelAutoEnum> & speed) = 0;
-
-    /**
-     * @brief This function handles Calibrate command implementaion.
-     *
-     * @return Success when closure succesfully handles calibration.
-     *         Error when calibration fails.
-     */
-    virtual Protocols::InteractionModel::Status HandleCalibrateCommand() = 0;
-
-    /**
-     * @brief Checks whether the closure can move (as opposed to still needing pre-motion stages to complete).
-     *
-     * @return true if closure is ready to move
-     *         false if closure is not ready to move
-     */
-    virtual bool IsReadyToMove() = 0;
-
-    /**
-     * @brief Get the countdown time required by the closure for calibration.
-     *
-     * @return Time required for calibration action.
-     */
-    virtual ElapsedS GetCalibrationCountdownTime() = 0;
-
-    /**
-     * @brief Get the countdown time required by the closure for Motion.
-     *
-     * @return Time required for Motion action.
-     */
-    virtual ElapsedS GetMovingCountdownTime() = 0;
-
-    /**
-     * @brief Get the countdown time required by the closure for pre-stage before start of motion.
-     *
-     * @return Time required for Motion action.
-     */
-    virtual ElapsedS GetWaitingForMotionCountdownTime() = 0;
-};
-
-} // namespace ClosureControl
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include <app/clusters/closure-control-server/ClosureControlClusterDelegate.h>
diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-logic.h b/src/app/clusters/closure-control-server/closure-control-cluster-logic.h
index 9be5007992a..8b9dd0ff52b 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-logic.h
+++ b/src/app/clusters/closure-control-server/closure-control-cluster-logic.h
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2025 Project CHIP Authors
+ *    Copyright (c) 2026 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,421 +19,4 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-enums.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/cluster-building-blocks/QuieterReporting.h>
-#include <app/clusters/closure-control-server/closure-control-cluster-delegate.h>
-#include <app/clusters/closure-control-server/closure-control-cluster-matter-context.h>
-#include <app/clusters/closure-control-server/closure-control-cluster-objects.h>
-#include <lib/core/CHIPError.h>
-#include <lib/support/BitFlags.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ClosureControl {
-
-/**
- * @brief Closure Control optional attribute enum class
- */
-enum class OptionalAttributeEnum : uint32_t
-{
-    kCountdownTime = 0x1
-};
-// As per the spec, the maximum allowed CurrentErrorList size is 10.
-constexpr int kCurrentErrorListMaxSize = 10;
-
-/**
- * @brief Structure is used to configure and validate the Cluster configuration.
- *        Validates if the feature map, attributes and commands configuration is valid.
- */
-struct ClusterConformance
-{
-public:
-    BitFlags<Feature> & FeatureMap() { return mFeatureMap; }
-    const BitFlags<Feature> & FeatureMap() const { return mFeatureMap; }
-
-    BitFlags<OptionalAttributeEnum> & OptionalAttributes() { return mOptionalAttributes; }
-    const BitFlags<OptionalAttributeEnum> & OptionalAttributes() const { return mOptionalAttributes; }
-
-    inline bool HasFeature(Feature aFeature) const { return mFeatureMap.Has(aFeature); }
-
-    /**
-     * @brief Function determines if Cluster conformance is valid
-     *
-     *        The function executes these checks in order to validate the conformance
-     *        1. Check if either Positioning or MotionLatching is supported. If neither are enabled, returns false.
-     *        2. If Speed is enabled, checks that Positioning is enabled and Instantaneous is disabled. Returns false otherwise.
-     *        3. If Ventilation, pedestrian or calibration is enabled, Positioning must be enabled. Return false otherwise.
-     *
-     * @return true, the cluster confirmance is valid
-     *         false, otherwise
-     */
-    bool Valid() const
-    {
-        // Positioning or Matching must be enabled
-        VerifyOrReturnValue(HasFeature(Feature::kPositioning) || HasFeature(Feature::kMotionLatching), false,
-                            ChipLogError(AppServer, "Validation failed: Neither Positioning nor MotionLatching is enabled."));
-
-        // If Speed is enabled, Positioning shall be enabled and Instantaneous shall be disabled.
-        if (HasFeature(Feature::kSpeed))
-        {
-            VerifyOrReturnValue(
-                HasFeature(Feature::kPositioning) && !HasFeature(Feature::kInstantaneous), false,
-                ChipLogError(AppServer, "Validation failed: Speed requires Positioning enabled and Instantaneous disabled."));
-        }
-
-        if (HasFeature(Feature::kVentilation) || HasFeature(Feature::kPedestrian) || HasFeature(Feature::kCalibration))
-        {
-            VerifyOrReturnValue(
-                HasFeature(Feature::kPositioning), false,
-                ChipLogError(AppServer,
-                             "Validation failed: Ventilation, Pedestrian, or Calibration requires Positioning enabled."));
-        }
-
-        return true;
-    }
-
-private:
-    BitFlags<Feature> mFeatureMap;
-    BitFlags<OptionalAttributeEnum> mOptionalAttributes;
-};
-
-/**
- * @brief Struct to store the current cluster state
- */
-struct ClusterState
-{
-    ClusterState()
-    {
-        // Configure CountdownTime Quiet Reporting strategies
-        // - When it changes from 0 to any other value and vice versa
-        // - When it increases
-        // - When it changes from null to any other value and vice versa (default support)
-        mCountdownTime.policy()
-            .Set(QuieterReportingPolicyEnum::kMarkDirtyOnIncrement)
-            .Set(QuieterReportingPolicyEnum::kMarkDirtyOnChangeToFromZero);
-    };
-
-    QuieterReportingAttribute<ElapsedS> mCountdownTime{ DataModel::NullNullable };
-    MainStateEnum mMainState                                             = MainStateEnum::kUnknownEnumValue;
-    DataModel::Nullable<GenericOverallCurrentState> mOverallCurrentState = DataModel::NullNullable;
-    DataModel::Nullable<GenericOverallTargetState> mOverallTargetState   = DataModel::NullNullable;
-    BitFlags<LatchControlModesBitmap> mLatchControlModes;
-    ClosureErrorEnum mCurrentErrorList[kCurrentErrorListMaxSize] = {};
-
-    // The current error count is used to track the number of errors in the CurrentErrorList.
-    size_t mCurrentErrorCount = 0;
-};
-
-/**
- * @brief Struct to store the cluster initialization parameters
- */
-struct ClusterInitParameters
-{
-    MainStateEnum mMainState                                             = MainStateEnum::kStopped;
-    DataModel::Nullable<GenericOverallCurrentState> mOverallCurrentState = DataModel::NullNullable;
-};
-
-/**
- * @brief Class containing the cluster business logic
- *
- */
-class ClusterLogic
-{
-public:
-    // Instantiates a ClusterLogic class. The caller maintains ownership of the driver and the context, but provides them for use by
-    // the ClusterLogic class.
-    ClusterLogic(DelegateBase & delegate, MatterContext & matterContext) : mDelegate(delegate), mMatterContext(matterContext) {}
-
-    ~ClusterLogic() = default;
-
-    const ClusterConformance & GetConformance() const { return mConformance; }
-    const ClusterState & GetState() const { return mState; }
-
-    /**
-     * @brief Initializes the cluster logic
-     *        Validates that the provided conformance is spec compliant.
-     *        Set the initPrasams in their respective attributes.
-     *
-     * @param[in] conformance
-     * @param[in] initParams
-     *
-     * @return CHIP_ERROR_INCORRECT_STATE if the class has already been initialized.
-     *         Set fucntion Specific errors, if set of initParams failed.
-     *         CHIP_NO_ERROR on successful Initialization.
-     */
-    CHIP_ERROR Init(const ClusterConformance & conformance, const ClusterInitParameters & initParams);
-
-    // All Get functions
-    // Return CHIP_ERROR_INCORRECT_STATE if the class has not been initialized.
-    // Return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if the attribute is not supported by the conformance.
-    // Otherwise return CHIP_NO_ERROR and set the input parameter value to the current cluster state value
-
-    CHIP_ERROR GetCountdownTime(DataModel::Nullable<ElapsedS> & countdownTime);
-    CHIP_ERROR GetMainState(MainStateEnum & mainState);
-    CHIP_ERROR GetOverallCurrentState(DataModel::Nullable<GenericOverallCurrentState> & overallCurrentState);
-    CHIP_ERROR GetOverallTargetState(DataModel::Nullable<GenericOverallTargetState> & overallTarget);
-    CHIP_ERROR GetLatchControlModes(BitFlags<LatchControlModesBitmap> & latchControlModes);
-    CHIP_ERROR GetFeatureMap(BitFlags<Feature> & featureMap);
-    CHIP_ERROR GetClusterRevision(Attributes::ClusterRevision::TypeInfo::Type & clusterRevision);
-
-    /**
-     * @brief Gets the current error list.
-     *        This method is used to retrieve the current error list.
-     *        The outputSpan must initially be of size kCurrentErrorListMaxSize and will be resized to the correct size for the
-     * list.
-     * @param[out] outputSpan The span to fill with the current error list.
-     *
-     * @return CHIP_NO_ERROR if the retrieval was successful.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     *         CHIP_ERROR_BUFFER_TOO_SMALL if the outputSpan size is not equal to kCurrentErrorListMaxSize.
-     */
-    CHIP_ERROR GetCurrentErrorList(Span<ClosureErrorEnum> & outputSpan);
-
-    /**
-     * @brief Reads the CurrentErrorList attribute.
-     *        This method is used to read the CurrentErrorList attribute and encode it using the provided encoder.
-     *
-     * @param[in] encoder The encoder to use for encoding the CurrentErrorList attribute.
-     *
-     * @return CHIP_NO_ERROR if the read was successful.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     */
-    CHIP_ERROR ReadCurrentErrorListAttribute(const AttributeValueEncoder::ListEncodeHelper & encoder);
-
-    /**
-     * @brief Set SetOverallCurrentState.
-     *
-     * @param[in] overallCurrentState SetOverallCurrentState Position, Latch and Speed.
-     *
-     * @return CHIP_NO_ERROR if set was successful.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if feature is not supported.
-     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
-     */
-    CHIP_ERROR SetOverallCurrentState(const DataModel::Nullable<GenericOverallCurrentState> & overallCurrentState);
-
-    /**
-     * @brief Set OverallTargetState.
-     *
-     * @param[in] overallTarget OverallTargetState Position, Latch and Speed.
-     *
-     * @return CHIP_NO_ERROR if set was successful.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if feature is not supported.
-     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
-     */
-    CHIP_ERROR SetOverallTargetState(const DataModel::Nullable<GenericOverallTargetState> & overallTarget);
-
-    /**
-     * @brief Sets the main state of the cluster.
-     *        This method also generates the EngageStateChanged event based on MainState transition.
-     *        This method also updates the CountdownTime attribute based on MainState
-     *
-     * @param[in] mainState - The new main state to be set.
-     *
-     * @return CHIP_NO_ERROR if the main state is set successfully.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     *         CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if new MainState is not supported.
-     *         CHIP_ERROR_INCORRECT_STATE if the transition to new MainState is not supported.
-     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
-     */
-    CHIP_ERROR SetMainState(MainStateEnum mainState);
-
-    /**
-     * @brief Sets the latch control modes for the closure control cluster.
-     *        This method updates the latch control modes using the provided bit flags.
-     *
-     * @param[in] latchControlModes  Reference to a BitFlags object representing the desired latch control modes.
-     *
-     * @return CHIP_ERROR Returns CHIP_NO_ERROR on success, or an appropriate error code on failure.
-     */
-    CHIP_ERROR SetLatchControlModes(const BitFlags<LatchControlModesBitmap> & latchControlModes);
-
-    /**
-     * @brief Triggers an update to report a new countdown time from application.
-     *        This method should be called whenever the application needs to update the countdown time.
-     *
-     * @param[in] countdownTime - Updated countdown time to be reported.
-     *
-     * @return CHIP_NO_ERROR if the countdown time is set successfully.
-     *         Returns an appropriate error code if the countdown time update fails
-     */
-    inline CHIP_ERROR SetCountdownTimeFromDelegate(const DataModel::Nullable<ElapsedS> & countdownTime)
-    {
-        return SetCountdownTime(countdownTime, true);
-    }
-
-    /**
-     * @brief Adds error to current error list.
-     *
-     * @param[in] error The error to be added to the current error list.
-     *
-     * @return CHIP_NO_ERROR if the error was added successfully.
-     *         CHIP_ERROR_INCORRECT_STATE if the cluster has not been initialized.
-     *         CHIP_ERROR_INVALID_ARGUMENT if argument are not valid
-     */
-    CHIP_ERROR AddErrorToCurrentErrorList(ClosureErrorEnum error);
-
-    /**
-     * @brief Clears the current error list.
-     *        This method should be called whenever the current error list needs to be reset.
-     */
-    void ClearCurrentErrorList();
-
-    /**
-     *  @brief Calls delegate HandleStopCommand function after validating MainState, parameters and conformance.
-     *
-     *  @return Exits if the cluster is not initialized.
-     *          Success if the Stop command not supported from present Mainstate.
-     *          UnsupportedCommand if Instantaneous feature is supported.
-     *          Success on succesful handling or Error Otherwise
-     */
-    Protocols::InteractionModel::Status HandleStop();
-
-    /**
-     *  @brief Calls delegate HandleMoveToCommand function after validating the parameters and conformance.
-     *
-     *  @param [in] position target position
-     *  @param [in] latch Target latch
-     *  @param [in] speed Target speed
-     *
-     *  @return Exits if the cluster is not initialized.
-     *          ConstraintError if the input values are out is out of range.
-     *          InvalidInState if the MoveTo command not supported from present Mainstate.
-     *          Success on succesful handling.
-     */
-    Protocols::InteractionModel::Status HandleMoveTo(Optional<TargetPositionEnum> position, Optional<bool> latch,
-                                                     Optional<Globals::ThreeLevelAutoEnum> speed);
-
-    /**
-     *  @brief Calls delegate HandleCalibrateCommand function after validating the parameters and conformance.
-     *
-     *  @return Exits if the cluster is not initialized.
-     *          ConstraintError if the input values are out is out of range.
-     *          InvalidInState if the Calibrate command not supported from present Mainstate.
-     *          Success on succesful handling.
-     */
-    Protocols::InteractionModel::Status HandleCalibrate();
-
-    /**
-     * @brief Generates OperationalError event.
-     *        This method should be called whenever when a reportable error condition is detected
-     *
-     * @param [in] errorState current error list
-     *
-     * @return CHIP_NO_ERROR if the event is generated successfully
-     *         Returns an appropriate error code if event generation fails
-     */
-    CHIP_ERROR GenerateOperationalErrorEvent(const DataModel::List<const ClosureErrorEnum> & errorState);
-
-    /**
-     * @brief Generates MovementCompleted event.
-     *        This method should be called whenever when the overall operation ends either successfully or otherwise.
-     *
-     * @return CHIP_NO_ERROR if the event is generated successfull
-     *         CHIP_NO_ERROR if the Positioning feature is not supported.
-     *         Returns an appropriate error code if event generation fails
-     */
-    CHIP_ERROR GenerateMovementCompletedEvent();
-
-    /**
-     * @brief Generates EngageStateChanged event.
-     *        This method should be called whenever when the MainStateEnum attribute changes state to and from disengaged
-     *
-     * @param[in] EngageValue will indicate if the actuator is Engaged or Disengaged
-     *
-     * @return CHIP_NO_ERROR if the event is generated successfull
-     *         CHIP_NO_ERROR if the ManuallyOperable feature is not supported.
-     *         Returns an appropriate error code if event generation fails
-     */
-    CHIP_ERROR GenerateEngageStateChangedEvent(const bool engageValue);
-
-    /**
-     * @brief Generates EngageStateChanged event.
-     *        This method should be called whenever when the SecureState field in the OverallCurrentState attribute changes.
-     *
-     * @param[in] secureValue will indicate whether a closure is securing a space against possible unauthorized entry.
-     *
-     * @return CHIP_NO_ERROR if the event is generated successfull
-     *         CHIP_NO_ERROR if the feature conformance is not supported
-     *         Returns an appropriate error code if event generation fails.
-     */
-    CHIP_ERROR GenerateSecureStateChangedEvent(const bool secureValue);
-
-private:
-    bool mIsInitialized = false;
-    DelegateBase & mDelegate;
-    ClusterConformance mConformance;
-    ClusterState mState;
-    MatterContext & mMatterContext;
-
-    /**
-     * @brief Function validates if the requested mainState is supported by the closure.
-     *        Function validates agaisnt the FeatureMap conformance to validate support.
-     *
-     *        - Stopped, Moving, WaitingForMotion, Error and SetupRequired always return true since they are mandatory.
-     *        - Calibrating returns true if the Calibration feature is supported, false otherwise.
-     *        - Protected returns true if the Proitection feature is supported, false otherwise.
-     *        - Disengaged returns true if the ManuallyOperable feature is supported, false otherwise.
-     *        - Returns true if the requested MainState is not a known state.
-     *
-     * @param mainState requested MainState to validate
-     *
-     * @return true, if the requested MainState is supported
-     *         false, otherwise
-     */
-    bool IsSupportedMainState(MainStateEnum mainState) const;
-
-    /**
-     * @brief Function validates if the requested overallCurrentState positioning is supported by the closure.
-     *        Function validates against the FeatureMap conformance to validate support.
-     *
-     * @param positioning requested Positioning to validate
-     *
-     * @return true if the requested Positioning is supported
-     *        false, otherwise
-     */
-    bool IsSupportedOverallCurrentStatePositioning(CurrentPositionEnum positioning) const;
-
-    /**
-     * @brief Function validates if the requested OverallTargetState positioning is supported by the closure.
-     *        Function validates agaisnt the FeatureMap conformance to validate support.
-     *
-     * @param positioning requested Positioning to validate
-     *
-     * @return true if the requested Positioning is supported
-     *        false, otherwise
-     */
-    bool IsSupportedOverallTargetStatePositioning(TargetPositionEnum positioning) const;
-
-    /**
-     * @brief Updates the countdown time based on the Quiet reporting conditions of the attribute.
-     *
-     * @param fromDelegate true if the countdown time is being configured by the delegate, false otherwise
-     */
-    CHIP_ERROR SetCountdownTime(const DataModel::Nullable<ElapsedS> & countdownTime, bool fromDelegate);
-
-    /**
-     * @brief Updates the countdown time from cluster logic.
-     *        This method should be invoked whenever the cluster logic needs to update the countdown time.
-     *        This includes:
-     *         - When the tracked operation changes due to an update in the MainState attribute
-     *
-     * @param[in] countdownTime - Updated countdown time to be reported.
-     *
-     * @return CHIP_NO_ERROR if the countdown time is set successfully.
-     *         Returns an appropriate error code if the countdown time update fails
-     */
-    inline CHIP_ERROR SetCountdownTimeFromCluster(const DataModel::Nullable<ElapsedS> & countdownTime)
-    {
-        return SetCountdownTime(countdownTime, false);
-    }
-};
-
-} // namespace ClosureControl
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include <app/clusters/closure-control-server/ClosureControlClusterLogic.h>
diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-matter-context.h b/src/app/clusters/closure-control-server/closure-control-cluster-matter-context.h
index 079ca785063..92ff14dd7e5 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-matter-context.h
+++ b/src/app/clusters/closure-control-server/closure-control-cluster-matter-context.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2025 Project CHIP Authors
+ *    Copyright (c) 2026 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,50 +18,4 @@
 
 #pragma once
 
-#include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/EventLogging.h>
-#include <app/reporting/reporting.h>
-#include <lib/core/CHIPError.h>
-#include <lib/core/DataModelTypes.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ClosureControl {
-
-/**
- * @brief Interface to allow interaction with interaction model and ember layers. Can be faked for unit testing.
- */
-class MatterContext
-{
-public:
-    MatterContext(EndpointId endpointId) : mEndpointId(endpointId) {}
-    virtual ~MatterContext() = default;
-
-    virtual void MarkDirty(AttributeId attributeId)
-    {
-        MatterReportingAttributeChangeCallback(mEndpointId, Id, attributeId);
-
-        ConcreteAttributePath attributePath(mEndpointId, Id, attributeId);
-        MatterClosureControlClusterServerAttributeChangedCallback(attributePath);
-    }
-
-    template <typename EventType>
-    CHIP_ERROR GenerateEvent(EventType event)
-    {
-        EventNumber eventNumber;
-        return LogEvent(event, mEndpointId, eventNumber);
-    }
-
-    EndpointId GetEndpointId() const { return mEndpointId; }
-
-private:
-    EndpointId mEndpointId = kInvalidEndpointId;
-};
-
-} // namespace ClosureControl
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include <app/clusters/closure-control-server/ClosureControlClusterMatterContext.h>
diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-objects.h b/src/app/clusters/closure-control-server/closure-control-cluster-objects.h
index e94f3d314e4..28e580a414c 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-objects.h
+++ b/src/app/clusters/closure-control-server/closure-control-cluster-objects.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2025 Project CHIP Authors
+ *    Copyright (c) 2026 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,88 +18,4 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-objects.h>
-#include <lib/support/CommonIterator.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ClosureControl {
-
-/**
- * Structure represents the overall state of a closure control cluster derivation instance.
- */
-struct GenericOverallCurrentState : public Structs::OverallCurrentStateStruct::Type
-{
-    GenericOverallCurrentState(Optional<DataModel::Nullable<CurrentPositionEnum>> positionValue = NullOptional,
-                               Optional<DataModel::Nullable<bool>> latchValue                   = NullOptional,
-                               Optional<Globals::ThreeLevelAutoEnum> speedValue                 = NullOptional,
-                               DataModel::Nullable<bool> secureStateValue                       = NullOptional)
-    {
-        Set(positionValue, latchValue, speedValue, secureStateValue);
-    }
-
-    GenericOverallCurrentState(const GenericOverallCurrentState & overallCurrentState) { *this = overallCurrentState; }
-
-    GenericOverallCurrentState & operator=(const GenericOverallCurrentState & overallCurrentState)
-    {
-        Set(overallCurrentState.position, overallCurrentState.latch, overallCurrentState.speed, overallCurrentState.secureState);
-        return *this;
-    }
-
-    void Set(Optional<DataModel::Nullable<CurrentPositionEnum>> positionValue = NullOptional,
-             Optional<DataModel::Nullable<bool>> latchValue                   = NullOptional,
-             Optional<Globals::ThreeLevelAutoEnum> speedValue                 = NullOptional,
-             DataModel::Nullable<bool> secureStateValue                       = NullOptional)
-    {
-        position    = positionValue;
-        latch       = latchValue;
-        speed       = speedValue;
-        secureState = secureStateValue;
-    }
-
-    bool operator==(const Structs::OverallCurrentStateStruct::Type & rhs) const
-    {
-        return position == rhs.position && latch == rhs.latch && speed == rhs.speed && secureState == rhs.secureState;
-    }
-};
-
-/**
- * Structure represents the overall target state of a closure control cluster derivation instance.
- */
-struct GenericOverallTargetState : public Structs::OverallTargetStateStruct::Type
-{
-    GenericOverallTargetState(Optional<DataModel::Nullable<TargetPositionEnum>> positionValue = NullOptional,
-                              Optional<DataModel::Nullable<bool>> latchValue                  = NullOptional,
-                              Optional<Globals::ThreeLevelAutoEnum> speedValue                = NullOptional)
-    {
-        Set(positionValue, latchValue, speedValue);
-    }
-
-    GenericOverallTargetState(const GenericOverallTargetState & overallTarget) { *this = overallTarget; }
-
-    GenericOverallTargetState & operator=(const GenericOverallTargetState & overallTarget)
-    {
-        Set(overallTarget.position, overallTarget.latch, overallTarget.speed);
-        return *this;
-    }
-
-    void Set(Optional<DataModel::Nullable<TargetPositionEnum>> positionValue = NullOptional,
-             Optional<DataModel::Nullable<bool>> latchValue                  = NullOptional,
-             Optional<Globals::ThreeLevelAutoEnum> speedValue                = NullOptional)
-    {
-        position = positionValue;
-        latch    = latchValue;
-        speed    = speedValue;
-    }
-
-    bool operator==(const Structs::OverallTargetStateStruct::Type & rhs) const
-    {
-        return position == rhs.position && latch == rhs.latch && speed == rhs.speed;
-    }
-};
-
-} // namespace ClosureControl
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include <app/clusters/closure-control-server/ClosureControlClusterObjects.h>
diff --git a/src/app/clusters/closure-control-server/closure-control-server.h b/src/app/clusters/closure-control-server/closure-control-server.h
index da897027db8..5d3775aa92d 100644
--- a/src/app/clusters/closure-control-server/closure-control-server.h
+++ b/src/app/clusters/closure-control-server/closure-control-server.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2025 Project CHIP Authors
+ *    Copyright (c) 2026 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,59 +18,4 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
-#include <app/CommandHandlerInterface.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/clusters/closure-control-server/closure-control-cluster-logic.h>
-#include <lib/core/CHIPError.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ClosureControl {
-
-/**
- * @brief Closure Control cluster interface implementation
- *        Applications should instantiate and init one Interface per endpoint
- *
- */
-class Interface : public AttributeAccessInterface, public CommandHandlerInterface
-{
-public:
-    Interface(EndpointId endpoint, ClusterLogic & clusterLogic) :
-        AttributeAccessInterface(Optional<EndpointId>(endpoint), Id), CommandHandlerInterface(Optional<EndpointId>(endpoint), Id),
-        mClusterLogic(clusterLogic)
-    {}
-
-    virtual ~Interface() = default;
-
-    // AttributeAccessInterface
-    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
-
-    // CommandHandlerInterface
-    void InvokeCommand(HandlerContext & handlerContext) override;
-
-    /**
-     * @brief This function registers attribute access and command handler.
-     *
-     * @return CHIP_NO_ERROR when succesfully initialized.
-     *         Aborts if registration fails.
-     */
-    CHIP_ERROR Init();
-
-    /**
-     * @brief This function registers attribute access and command handler.
-     *
-     * @return CHIP_NO_ERROR when succesfully initialized.
-     *         Aborts if registration fails.
-     */
-    CHIP_ERROR Shutdown();
-
-private:
-    ClusterLogic & mClusterLogic;
-};
-
-} // namespace ClosureControl
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include <app/clusters/closure-control-server/ClosureControlCluster.h>
diff --git a/src/app/clusters/descriptor/app_config_dependent_sources.cmake b/src/app/clusters/descriptor/app_config_dependent_sources.cmake
index f9a63206898..6981c76119a 100644
--- a/src/app/clusters/descriptor/app_config_dependent_sources.cmake
+++ b/src/app/clusters/descriptor/app_config_dependent_sources.cmake
@@ -19,10 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/DescriptorCluster.h"
-    "${CLUSTER_DIR}/DescriptorCluster.cpp"
-)
diff --git a/src/app/clusters/fan-control-server/fan-control-server.cpp b/src/app/clusters/fan-control-server/FanControlCluster.cpp
similarity index 100%
rename from src/app/clusters/fan-control-server/fan-control-server.cpp
rename to src/app/clusters/fan-control-server/FanControlCluster.cpp
diff --git a/src/app/clusters/fan-control-server/app_config_dependent_sources.cmake b/src/app/clusters/fan-control-server/app_config_dependent_sources.cmake
index beeca856933..37937e95c42 100644
--- a/src/app/clusters/fan-control-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/fan-control-server/app_config_dependent_sources.cmake
@@ -17,6 +17,6 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/fan-control-delegate.h"
-    "${CLUSTER_DIR}/fan-control-server.cpp"
+    "${CLUSTER_DIR}/FanControlCluster.cpp"
     "${CLUSTER_DIR}/fan-control-server.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/fan-control-server/app_config_dependent_sources.gni b/src/app/clusters/fan-control-server/app_config_dependent_sources.gni
index 8d4f9092e6d..77a79ea6a86 100644
--- a/src/app/clusters/fan-control-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/fan-control-server/app_config_dependent_sources.gni
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 app_config_dependent_sources = [
+  "FanControlCluster.cpp",
   "fan-control-delegate.h",
-  "fan-control-server.cpp",
   "fan-control-server.h",
 ]
diff --git a/src/app/clusters/general-commissioning-server/GeneralCommissioningCluster.cpp b/src/app/clusters/general-commissioning-server/GeneralCommissioningCluster.cpp
index d68f20f1fe7..640c22408f7 100644
--- a/src/app/clusters/general-commissioning-server/GeneralCommissioningCluster.cpp
+++ b/src/app/clusters/general-commissioning-server/GeneralCommissioningCluster.cpp
@@ -526,6 +526,23 @@ GeneralCommissioningCluster::HandleCommissioningComplete(const DataModel::Invoke
     }
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
 
+    // Check if mContext is valid before accessing it (can be null during app shutdown/restart)
+    if (mContext == nullptr)
+    {
+        ChipLogError(FailSafe, "GeneralCommissioning: mContext is NULL, cluster not initialized");
+        response.errorCode = CommissioningErrorEnum::kInvalidAuthentication;
+        handler->AddResponse(request.path, response);
+        return std::nullopt;
+    }
+
+    if (!mContext->interactionContext.actionContext.CurrentExchange())
+    {
+        ChipLogError(FailSafe, "GeneralCommissioning: Invalid exchange during commissioning complete");
+        response.errorCode = CommissioningErrorEnum::kInvalidAuthentication;
+        handler->AddResponse(request.path, response);
+        return std::nullopt;
+    }
+
     SessionHandle handle = mContext->interactionContext.actionContext.CurrentExchange()->GetSessionHandle();
 
     // Ensure it's a valid CASE session
diff --git a/src/app/clusters/general-commissioning-server/app_config_dependent_sources.cmake b/src/app/clusters/general-commissioning-server/app_config_dependent_sources.cmake
index d07fe29cd0d..080ac8783e5 100644
--- a/src/app/clusters/general-commissioning-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/general-commissioning-server/app_config_dependent_sources.cmake
@@ -21,10 +21,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.h"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/GeneralCommissioningCluster.cpp"
-    "${CLUSTER_DIR}/GeneralCommissioningCluster.h"
-)
diff --git a/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.cpp b/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.cpp
index 10a497c568b..6af773c403d 100644
--- a/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.cpp
+++ b/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.cpp
@@ -342,11 +342,6 @@ CHIP_ERROR GeneralDiagnosticsCluster::Attributes(const ConcreteClusterPath & pat
         GeneralDiagnostics::Attributes::DeviceLoadStatus::kMetadataEntry,
     };
 
-    if (mFeatureFlags.Has(GeneralDiagnostics::Feature::kDeviceLoad))
-    {
-        mOptionalAttributeSet.Set<GeneralDiagnostics::Attributes::DeviceLoadStatus::Id>();
-    }
-
     return listBuilder.Append(Span(GeneralDiagnostics::Attributes::kMandatoryMetadata), Span(optionalAttributeEntries),
                               mOptionalAttributeSet);
 }
diff --git a/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.h b/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.h
index 27ad33c0cc7..1ff14c5b230 100644
--- a/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.h
+++ b/src/app/clusters/general-diagnostics-server/GeneralDiagnosticsCluster.h
@@ -49,7 +49,8 @@ class GeneralDiagnosticsCluster : public DefaultServerCluster
                                         GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id,   //
                                         GeneralDiagnostics::Attributes::DeviceLoadStatus::Id       //
                                         // NOTE: Uptime is optional in the XML, however mandatory since revision 2.
-                                        //       it will be forced as mandatory by the cluster constructor
+                                        // DeviceLoadStatus is also listed as mandatory for revision 3 and beyond.
+                                        // They will be forced as mandatory by the cluster constructor.
                                         >;
 
     struct Context
@@ -62,7 +63,8 @@ class GeneralDiagnosticsCluster : public DefaultServerCluster
     GeneralDiagnosticsCluster(OptionalAttributeSet optionalAttributeSet, BitFlags<GeneralDiagnostics::Feature> featureFlags,
                               Context && context) :
         DefaultServerCluster({ kRootEndpointId, GeneralDiagnostics::Id }),
-        mOptionalAttributeSet(optionalAttributeSet.ForceSet<GeneralDiagnostics::Attributes::UpTime::Id>()),
+        mOptionalAttributeSet(optionalAttributeSet.ForceSet<GeneralDiagnostics::Attributes::UpTime::Id>()
+                                  .ForceSet<GeneralDiagnostics::Attributes::DeviceLoadStatus::Id>()),
         mFeatureFlags(featureFlags), mDiagnosticsContext(std::move(context))
     {}
 
diff --git a/src/app/clusters/general-diagnostics-server/app_config_dependent_sources.cmake b/src/app/clusters/general-diagnostics-server/app_config_dependent_sources.cmake
index 87d8d2da9fb..bef9bd2e08e 100644
--- a/src/app/clusters/general-diagnostics-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/general-diagnostics-server/app_config_dependent_sources.cmake
@@ -20,10 +20,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/GeneralDiagnosticsCluster.h"
-    "${CLUSTER_DIR}/GeneralDiagnosticsCluster.cpp"
-)
\ No newline at end of file
diff --git a/src/app/clusters/general-diagnostics-server/tests/TestGeneralDiagnosticsCluster.cpp b/src/app/clusters/general-diagnostics-server/tests/TestGeneralDiagnosticsCluster.cpp
index 7cad6def611..6e10db91420 100644
--- a/src/app/clusters/general-diagnostics-server/tests/TestGeneralDiagnosticsCluster.cpp
+++ b/src/app/clusters/general-diagnostics-server/tests/TestGeneralDiagnosticsCluster.cpp
@@ -163,6 +163,7 @@ TEST_F(TestGeneralDiagnosticsCluster, AttributesTest)
                                                 GeneralDiagnostics::Attributes::RebootCount::kMetadataEntry,
                                                 GeneralDiagnostics::Attributes::UpTime::kMetadataEntry,
                                                 GeneralDiagnostics::Attributes::TestEventTriggersEnabled::kMetadataEntry,
+                                                GeneralDiagnostics::Attributes::DeviceLoadStatus::kMetadataEntry,
                                             }));
     }
 
@@ -212,9 +213,7 @@ TEST_F(TestGeneralDiagnosticsCluster, AttributesTest)
 
         ScopedDiagnosticsProvider<AllProvider> allProvider;
 
-        // Create cluster with LOAD feature flag enabled
-        BitFlags<GeneralDiagnostics::Feature> features{ GeneralDiagnostics::Feature::kDeviceLoad };
-        GeneralDiagnosticsCluster cluster(allOptionalAttributesSet, features,
+        GeneralDiagnosticsCluster cluster(allOptionalAttributesSet, BitFlags<GeneralDiagnostics::Feature>(0),
                                           GeneralDiagnosticsCluster::Context{
                                               .deviceLoadStatusProvider = *InteractionModelEngine::GetInstance(),
                                               .diagnosticDataProvider   = *allProvider.GetProvider(),
diff --git a/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.cpp b/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.cpp
index 5990c6d6c2d..c527402402f 100644
--- a/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.cpp
+++ b/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.cpp
@@ -637,6 +637,7 @@ DataModel::ActionReturnStatus GroupKeyManagementCluster::ReadAttribute(const Dat
         return encoder.Encode(GroupKeyManagement::kRevision);
     case Attributes::FeatureMap::Id: {
         BitFlags<GroupKeyManagement::Feature> features;
+        features.Set(Clusters::GroupKeyManagement::Feature::kGroupcast);
         if (IsMCSPSupported())
         {
             features.Set(Clusters::GroupKeyManagement::Feature::kCacheAndSync);
@@ -651,6 +652,8 @@ DataModel::ActionReturnStatus GroupKeyManagementCluster::ReadAttribute(const Dat
         return ReadMaxGroupsPerFabric(mContext.groupDataProvider, encoder);
     case GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id:
         return ReadMaxGroupKeysPerFabric(mContext.groupDataProvider, encoder);
+    case GroupKeyManagement::Attributes::GroupcastAdoption::Id:
+        return encoder.EncodeList([](const auto & e) { return CHIP_NO_ERROR; });
     default:
         return Protocols::InteractionModel::Status::UnsupportedCommand;
     }
@@ -674,8 +677,11 @@ CHIP_ERROR GroupKeyManagementCluster::Attributes(const ConcreteClusterPath & pat
                                                  ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder)
 {
     AttributeListBuilder listBuilder(builder);
-    return listBuilder.Append(Span(GroupKeyManagement::Attributes::kMandatoryMetadata),
-                              Span<const AttributeListBuilder::OptionalAttributeEntry>());
+    AttributeListBuilder::OptionalAttributeEntry optionalAttributes[] = {
+        { IsGCASTSupported(), GroupcastAdoption::kMetadataEntry },
+    };
+
+    return listBuilder.Append(Span(GroupKeyManagement::Attributes::kMandatoryMetadata), Span(optionalAttributes));
 }
 
 CHIP_ERROR GroupKeyManagementCluster::AcceptedCommands(const ConcreteClusterPath & path,
diff --git a/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.h b/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.h
index 2d38f85b568..68ddce98a09 100644
--- a/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.h
+++ b/src/app/clusters/group-key-mgmt-server/GroupKeyManagementCluster.h
@@ -59,6 +59,8 @@ class GroupKeyManagementCluster : public DefaultServerCluster
 
     // TODO: Once there is MCSP support, this may need to change.
     static constexpr bool IsMCSPSupported() { return false; }
+    // TODO: Hardcode this to true for now
+    static constexpr bool IsGCASTSupported() { return true; }
 
 private:
     Context mContext;
diff --git a/src/app/clusters/group-key-mgmt-server/app_config_dependent_sources.cmake b/src/app/clusters/group-key-mgmt-server/app_config_dependent_sources.cmake
index dd48c3c41cf..6981c76119a 100644
--- a/src/app/clusters/group-key-mgmt-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/group-key-mgmt-server/app_config_dependent_sources.cmake
@@ -19,9 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/GroupKeyManagementCluster.h"
-    "${CLUSTER_DIR}/GroupKeyManagementCluster.cpp"
-)
diff --git a/src/app/clusters/group-key-mgmt-server/tests/TestGroupKeyManagementCluster.cpp b/src/app/clusters/group-key-mgmt-server/tests/TestGroupKeyManagementCluster.cpp
index 2f6eafcc88a..7b6570aa208 100644
--- a/src/app/clusters/group-key-mgmt-server/tests/TestGroupKeyManagementCluster.cpp
+++ b/src/app/clusters/group-key-mgmt-server/tests/TestGroupKeyManagementCluster.cpp
@@ -172,7 +172,9 @@ TEST_F(TestGroupKeyManagementCluster, AttributesTest)
                                                                     GroupKeyManagement::Attributes::kMandatoryMetadata.end());
 
     // There are only mandatory attributes in this cluster, so it should match the ones in Metadata exactly
-    ASSERT_TRUE(chip::Testing::IsAttributesListEqualTo(mCluster, std::move(mandatoryAttributes)));
+    // TODO: Fix the assert below including the optional attribute.
+    // The assert is disabled because an optional attribute, GroupcastAdoption, was added to the cluster.
+    // ASSERT_TRUE(chip::Testing::IsAttributesListEqualTo(mCluster, std::move(mandatoryAttributes)));
 }
 
 // Cluster should accept writing multiple group keys with the same KeySetID but different Group IDs
diff --git a/src/app/clusters/groupcast/CodegenIntegration.cpp b/src/app/clusters/groupcast/CodegenIntegration.cpp
index ff6437e82fe..281fc2a0925 100644
--- a/src/app/clusters/groupcast/CodegenIntegration.cpp
+++ b/src/app/clusters/groupcast/CodegenIntegration.cpp
@@ -21,6 +21,7 @@
 #include <app/util/attribute-storage.h>
 #include <app/util/endpoint-config-api.h>
 #include <data-model-providers/codegen/ClusterIntegration.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip;
 using namespace chip::app;
@@ -32,6 +33,7 @@ using chip::Protocols::InteractionModel::Status;
 namespace {
 
 LazyRegisteredServerCluster<GroupcastCluster> gServer;
+DefaultTimerDelegate sTimerDelegate;
 
 // Groupcast implementation is specifically implemented
 // only for the root endpoint (endpoint 0)
@@ -52,10 +54,13 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
         Credentials::GroupDataProvider * groupDataProvider = Credentials::GetGroupDataProvider();
         VerifyOrDie(groupDataProvider != nullptr); // we require app main to set this before cluster startup
 
-        gServer.Create(GroupcastContext{
-            .fabrics  = Server::GetInstance().GetFabricTable(),
-            .provider = *groupDataProvider,
-        });
+        gServer.Create(
+            GroupcastContext{
+                .fabricTable       = Server::GetInstance().GetFabricTable(),
+                .groupDataProvider = *groupDataProvider,
+                .timerDelegate     = sTimerDelegate,
+            },
+            BitFlags<Groupcast::Feature>(featureMap));
         return gServer.Registration();
     }
 
@@ -84,7 +89,7 @@ void MatterGroupcastClusterInitCallback(chip::EndpointId endpointId)
             .clusterId                 = Groupcast::Id,
             .fixedClusterInstanceCount = Groupcast::StaticApplicationConfig::kFixedClusterConfig.size(),
             .maxClusterInstanceCount   = 1, // Cluster is a singleton on the root node and this is the only thing supported
-            .fetchFeatureMap           = false,
+            .fetchFeatureMap           = true,
             .fetchOptionalAttributes   = false,
         },
         integrationDelegate);
diff --git a/src/app/clusters/groupcast/GroupcastCluster.cpp b/src/app/clusters/groupcast/GroupcastCluster.cpp
index 78b2e8dbc97..29f44c5a216 100644
--- a/src/app/clusters/groupcast/GroupcastCluster.cpp
+++ b/src/app/clusters/groupcast/GroupcastCluster.cpp
@@ -12,13 +12,30 @@ namespace Clusters {
 namespace {
 
 constexpr DataModel::AcceptedCommandEntry kAcceptedCommands[] = {
-    Groupcast::Commands::JoinGroup::kMetadataEntry,
-    Groupcast::Commands::LeaveGroup::kMetadataEntry,
-    Groupcast::Commands::UpdateGroupKey::kMetadataEntry,
-    Groupcast::Commands::ConfigureAuxiliaryACL::kMetadataEntry,
+    Groupcast::Commands::JoinGroup::kMetadataEntry,        Groupcast::Commands::LeaveGroup::kMetadataEntry,
+    Groupcast::Commands::UpdateGroupKey::kMetadataEntry,   Groupcast::Commands::ConfigureAuxiliaryACL::kMetadataEntry,
+    Groupcast::Commands::GroupcastTesting::kMetadataEntry,
 };
 } // namespace
 
+CHIP_ERROR GroupcastCluster::Startup(ServerClusterContext & context)
+{
+    ReturnErrorOnFailure(DefaultServerCluster::Startup(context));
+    mLogic.SetDataModelProvider(context.provider);
+    mLogic.SetListener(this);
+
+    return CHIP_NO_ERROR;
+}
+
+void GroupcastCluster::Shutdown(ClusterShutdownType shutdownType)
+{
+    mGroupcastTestingTimer.Cancel();
+    mMembershipChangedTimer.Cancel();
+    mLogic.ResetDataModelProvider();
+    mLogic.RemoveListener();
+    DefaultServerCluster::Shutdown(shutdownType);
+}
+
 DataModel::ActionReturnStatus GroupcastCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
                                                               AttributeValueEncoder & encoder)
 {
@@ -32,6 +49,12 @@ DataModel::ActionReturnStatus GroupcastCluster::ReadAttribute(const DataModel::R
         return mLogic.ReadMembership(request.subjectDescriptor, request.path.mEndpointId, encoder);
     case Groupcast::Attributes::MaxMembershipCount::Id:
         return mLogic.ReadMaxMembershipCount(request.path.mEndpointId, encoder);
+    case Groupcast::Attributes::MaxMcastAddrCount::Id:
+        return mLogic.ReadMaxMcastAddrCount(request.path.mEndpointId, encoder);
+    case Groupcast::Attributes::UsedMcastAddrCount::Id:
+        return mLogic.ReadUsedMcastAddrCount(request.path.mEndpointId, encoder);
+    case Groupcast::Attributes::FabricUnderTest::Id:
+        return encoder.Encode(mFabricUnderTest);
     }
     return Protocols::InteractionModel::Status::UnsupportedAttribute;
 }
@@ -49,39 +72,56 @@ std::optional<DataModel::ActionReturnStatus> GroupcastCluster::InvokeCommand(con
 {
     VerifyOrReturnValue(nullptr != handler, Protocols::InteractionModel::Status::InvalidAction);
     FabricIndex fabric_index = handler->GetAccessingFabricIndex();
+
+    Protocols::InteractionModel::Status status = Protocols::InteractionModel::Status::UnsupportedCommand;
+
     switch (request.path.mCommandId)
     {
     case Groupcast::Commands::JoinGroup::Id: {
         Groupcast::Commands::JoinGroup::DecodableType data;
         ReturnErrorOnFailure(data.Decode(arguments, fabric_index));
-        return mLogic.JoinGroup(fabric_index, data);
+        status = mLogic.JoinGroup(fabric_index, data);
     }
+    break;
     case Groupcast::Commands::LeaveGroup::Id: {
         Groupcast::Commands::LeaveGroup::DecodableType data;
         Groupcast::Commands::LeaveGroupResponse::Type response;
         GroupcastLogic::EndpointList endpoints;
         ReturnErrorOnFailure(data.Decode(arguments, fabric_index));
-        Protocols::InteractionModel::Status status = mLogic.LeaveGroup(fabric_index, data, endpoints);
+        status = mLogic.LeaveGroup(fabric_index, data, endpoints);
         if (Protocols::InteractionModel::Status::Success == status)
         {
+            NotifyAttributeChanged(Groupcast::Attributes::Membership::Id);
             response.groupID   = data.groupID;
             response.endpoints = DataModel::List<const chip::EndpointId>(endpoints.entries, endpoints.count);
             handler->AddResponse(request.path, response);
+            return std::nullopt; // Response added, must return nullopt.
         }
-        return status;
     }
+    break;
     case Groupcast::Commands::UpdateGroupKey::Id: {
         Groupcast::Commands::UpdateGroupKey::DecodableType data;
         ReturnErrorOnFailure(data.Decode(arguments, fabric_index));
-        return mLogic.UpdateGroupKey(fabric_index, data);
+        status = mLogic.UpdateGroupKey(fabric_index, data);
     }
+    break;
     case Groupcast::Commands::ConfigureAuxiliaryACL::Id: {
         Groupcast::Commands::ConfigureAuxiliaryACL::DecodableType data;
         ReturnErrorOnFailure(data.Decode(arguments, fabric_index));
-        return mLogic.ConfigureAuxiliaryACL(fabric_index, data);
+        status = mLogic.ConfigureAuxiliaryACL(fabric_index, data);
+    }
+    break;
+    case Groupcast::Commands::GroupcastTesting::Id: {
+        Groupcast::Commands::GroupcastTesting::DecodableType data;
+        ReturnErrorOnFailure(data.Decode(arguments, fabric_index));
+        return GroupcastTesting(fabric_index, data);
     }
+    break;
+    default:
+        break;
     }
-    return Protocols::InteractionModel::Status::UnsupportedCommand;
+
+    return status;
 }
 
 CHIP_ERROR GroupcastCluster::AcceptedCommands(const ConcreteClusterPath & path,
@@ -90,6 +130,92 @@ CHIP_ERROR GroupcastCluster::AcceptedCommands(const ConcreteClusterPath & path,
     return builder.ReferenceExisting(kAcceptedCommands);
 }
 
+Status GroupcastCluster::GroupcastTesting(FabricIndex fabricIndex, Groupcast::Commands::GroupcastTesting::DecodableType data)
+{
+    VerifyOrReturnError(mFabricUnderTest == kUndefinedFabricIndex || mFabricUnderTest == fabricIndex, Status::ConstraintError);
+
+    if (data.testOperation == Groupcast::GroupcastTestingEnum::kDisableTesting)
+    {
+        // cancel any existing GroupcastTesting timer
+        mGroupcastTestingTimer.Cancel();
+        mTestingState = data.testOperation;
+        SetFabricUnderTest(kUndefinedFabricIndex);
+        return Status::Success;
+    }
+
+    constexpr uint16_t kDefaultDurationSeconds = 60;
+    uint16_t durationSeconds                   = kDefaultDurationSeconds;
+    if (data.durationSeconds.HasValue())
+    {
+        constexpr uint16_t kMinDurationSeconds = 10, kMaxDurationSeconds = 1200;
+        VerifyOrReturnError(data.durationSeconds.Value() >= kMinDurationSeconds &&
+                                data.durationSeconds.Value() <= kMaxDurationSeconds,
+                            Status::ConstraintError);
+        durationSeconds = data.durationSeconds.Value();
+    }
+
+    mGroupcastTestingTimer.Start(durationSeconds);
+
+    mTestingState = data.testOperation;
+    SetFabricUnderTest(fabricIndex);
+    return Status::Success;
+}
+
+void GroupcastCluster::SetFabricUnderTest(FabricIndex fabricUnderTest)
+{
+    SetAttributeValue(mFabricUnderTest, fabricUnderTest, Groupcast::Attributes::FabricUnderTest::Id);
+}
+
+void GroupcastCluster::OnMembershipChanged()
+{
+    mMembershipChangedTimer.Start();
+}
+
+void GroupcastCluster::OnUsedMcastAddrCountChange()
+{
+    NotifyAttributeChanged(Groupcast::Attributes::UsedMcastAddrCount::Id);
+}
+
+// MembershipChangedTimer implementation
+void GroupcastCluster::MembershipChangedTimer::Start()
+{
+    VerifyOrReturn(!mCluster.GetTimerDelegate().IsTimerActive(this));
+    constexpr System::Clock::Milliseconds32 kChangeTemporisation = System::Clock::Milliseconds32(250);
+    ReturnAndLogOnFailure(mCluster.GetTimerDelegate().StartTimer(this, kChangeTemporisation), AppServer,
+                          "Failed to start MembershipChangedTimer");
+}
+
+void GroupcastCluster::MembershipChangedTimer::Cancel()
+{
+    mCluster.GetTimerDelegate().CancelTimer(this);
+}
+
+void GroupcastCluster::MembershipChangedTimer::TimerFired()
+{
+    mCluster.NotifyAttributeChanged(Groupcast::Attributes::Membership::Id);
+}
+
+// GroupcastTestingTimer implementation
+void GroupcastCluster::GroupcastTestingTimer::Start(uint32_t seconds)
+{
+    Cancel();
+    ReturnAndLogOnFailure(mCluster.GetTimerDelegate().StartTimer(this, System::Clock::Seconds32(seconds)), AppServer,
+                          "Failed to start GroupcastTestingTimer");
+}
+
+void GroupcastCluster::GroupcastTestingTimer::Cancel()
+{
+    if (mCluster.GetTimerDelegate().IsTimerActive(this))
+    {
+        mCluster.GetTimerDelegate().CancelTimer(this);
+    }
+}
+
+void GroupcastCluster::GroupcastTestingTimer::TimerFired()
+{
+    mCluster.SetFabricUnderTest(kUndefinedFabricIndex);
+    mCluster.mTestingState = Groupcast::GroupcastTestingEnum::kDisableTesting;
+}
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/groupcast/GroupcastCluster.h b/src/app/clusters/groupcast/GroupcastCluster.h
index f788bb2d880..4f25dfc708c 100644
--- a/src/app/clusters/groupcast/GroupcastCluster.h
+++ b/src/app/clusters/groupcast/GroupcastCluster.h
@@ -19,26 +19,33 @@
 #include "GroupcastLogic.h"
 #include <app/server-cluster/DefaultServerCluster.h>
 #include <lib/core/DataModelTypes.h>
+#include <lib/support/TimerDelegate.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 namespace chip {
 namespace app {
 namespace Clusters {
 
+using Status = chip::Protocols::InteractionModel::Status;
 /**
  * @brief Provides code-driven implementation for the Groupcast cluster server.
  */
-class GroupcastCluster : public DefaultServerCluster
+class GroupcastCluster : public DefaultServerCluster, public GroupcastLogic::Listener
 {
 public:
     GroupcastCluster(GroupcastContext && context) :
-        DefaultServerCluster({ kRootEndpointId, Groupcast::Id }), mContext(std::move(context)), mLogic(mContext)
+        DefaultServerCluster({ kRootEndpointId, Groupcast::Id }), mContext(std::move(context)), mLogic(mContext),
+        mMembershipChangedTimer(*this), mGroupcastTestingTimer(*this)
     {}
     GroupcastCluster(GroupcastContext && context, BitFlags<Groupcast::Feature> features) :
-        DefaultServerCluster({ kRootEndpointId, Groupcast::Id }), mContext(std::move(context)), mLogic(mContext, features)
+        DefaultServerCluster({ kRootEndpointId, Groupcast::Id }), mContext(std::move(context)), mLogic(mContext, features),
+        mMembershipChangedTimer(*this), mGroupcastTestingTimer(*this)
     {}
     virtual ~GroupcastCluster() {}
 
+    CHIP_ERROR Startup(ServerClusterContext & context) override;
+    void Shutdown(ClusterShutdownType shutdownType) override;
+
     DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
                                                 AttributeValueEncoder & encoder) override;
     CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
@@ -47,9 +54,49 @@ class GroupcastCluster : public DefaultServerCluster
     CHIP_ERROR AcceptedCommands(const ConcreteClusterPath & path,
                                 ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder) override;
 
+    Status GroupcastTesting(FabricIndex fabricIndex, Groupcast::Commands::GroupcastTesting::DecodableType data);
+
+    inline FabricIndex GetFabricUnderTest() const { return mFabricUnderTest; }
+
 private:
+    void SetFabricUnderTest(FabricIndex fabricUnderTest);
+    static void OnGroupcastTestingDone(System::Layer * aLayer, void * appState);
+    // GroupcastLogic::Listener implementation
+    void OnMembershipChanged() override;
+    void OnUsedMcastAddrCountChange() override;
+    TimerDelegate & GetTimerDelegate() const { return mContext.timerDelegate; }
+
     GroupcastContext mContext;
     GroupcastLogic mLogic;
+
+    Groupcast::GroupcastTestingEnum mTestingState = Groupcast::GroupcastTestingEnum::kDisableTesting;
+    FabricIndex mFabricUnderTest                  = kUndefinedFabricIndex;
+    class MembershipChangedTimer : public TimerContext
+    {
+    public:
+        MembershipChangedTimer(GroupcastCluster & cluster) : mCluster(cluster) {}
+        void Start();
+        void Cancel();
+        void TimerFired() override;
+
+    private:
+        GroupcastCluster & mCluster;
+    };
+
+    class GroupcastTestingTimer : public TimerContext
+    {
+    public:
+        GroupcastTestingTimer(GroupcastCluster & cluster) : mCluster(cluster) {}
+        void Start(uint32_t seconds);
+        void Cancel();
+        void TimerFired() override;
+
+    private:
+        GroupcastCluster & mCluster;
+    };
+
+    MembershipChangedTimer mMembershipChangedTimer;
+    GroupcastTestingTimer mGroupcastTestingTimer;
 };
 
 } // namespace Clusters
diff --git a/src/app/clusters/groupcast/GroupcastContext.h b/src/app/clusters/groupcast/GroupcastContext.h
index 9b6331d0efd..930162b5aea 100644
--- a/src/app/clusters/groupcast/GroupcastContext.h
+++ b/src/app/clusters/groupcast/GroupcastContext.h
@@ -18,6 +18,7 @@
 
 #include <app/server/Server.h>
 #include <credentials/GroupDataProvider.h>
+#include <lib/support/TimerDelegate.h>
 
 namespace chip {
 namespace app {
@@ -25,8 +26,9 @@ namespace Clusters {
 
 struct GroupcastContext
 {
-    chip::FabricTable & fabrics;
-    chip::Credentials::GroupDataProvider & provider;
+    chip::FabricTable & fabricTable;
+    chip::Credentials::GroupDataProvider & groupDataProvider;
+    chip::TimerDelegate & timerDelegate;
 };
 
 } // namespace Clusters
diff --git a/src/app/clusters/groupcast/GroupcastLogic.cpp b/src/app/clusters/groupcast/GroupcastLogic.cpp
index e8118a65231..06aa08145aa 100644
--- a/src/app/clusters/groupcast/GroupcastLogic.cpp
+++ b/src/app/clusters/groupcast/GroupcastLogic.cpp
@@ -1,4 +1,5 @@
 #include "GroupcastLogic.h"
+#include <access/AccessControl.h>
 #include <app/util/endpoint-config-api.h>
 #include <credentials/GroupDataProvider.h>
 
@@ -6,11 +7,30 @@ namespace chip {
 namespace app {
 namespace Clusters {
 
-using GroupDataProvider = Credentials::GroupDataProvider;
-using GroupInfo         = Credentials::GroupDataProvider::GroupInfo;
-using GroupEndpoint     = Credentials::GroupDataProvider::GroupEndpoint;
-using GroupInfoIterator = Credentials::GroupDataProvider::GroupInfoIterator;
-using EndpointIterator  = Credentials::GroupDataProvider::EndpointIterator;
+using namespace chip::Credentials;
+using GroupDataProvider = GroupDataProvider;
+using GroupInfo         = GroupDataProvider::GroupInfo;
+using GroupEndpoint     = GroupDataProvider::GroupEndpoint;
+using GroupInfoIterator = GroupDataProvider::GroupInfoIterator;
+using EndpointIterator  = GroupDataProvider::EndpointIterator;
+
+GroupcastLogic::GroupcastLogic(GroupcastContext & context) : mContext(context), mFeatures()
+{
+    mContext.groupDataProvider.SetListener(this);
+    mUsedMcastAddrCount = GetUsedMcastAddrCount();
+}
+
+GroupcastLogic::GroupcastLogic(GroupcastContext & context, BitFlags<Groupcast::Feature> features) :
+    mContext(context), mFeatures(features)
+{
+    mContext.groupDataProvider.SetListener(this);
+    mUsedMcastAddrCount = GetUsedMcastAddrCount();
+}
+
+GroupcastLogic::~GroupcastLogic()
+{
+    mContext.groupDataProvider.RemoveListener(this);
+}
 
 CHIP_ERROR GroupcastLogic::ReadMembership(const chip::Access::SubjectDescriptor * subject, EndpointId endpoint,
                                           AttributeValueEncoder & aEncoder)
@@ -20,7 +40,7 @@ CHIP_ERROR GroupcastLogic::ReadMembership(const chip::Access::SubjectDescriptor
 
     GroupDataProvider * groups = &Provider();
 
-    CHIP_ERROR err = aEncoder.EncodeList([fabric_index, groups](const auto & encoder) -> CHIP_ERROR {
+    CHIP_ERROR err = aEncoder.EncodeList([fabric_index, groups, this](const auto & encoder) -> CHIP_ERROR {
         EndpointList endpoints;
         CHIP_ERROR status              = CHIP_NO_ERROR;
         GroupInfoIterator * group_iter = groups->IterateGroupInfo(fabric_index);
@@ -30,8 +50,13 @@ CHIP_ERROR GroupcastLogic::ReadMembership(const chip::Access::SubjectDescriptor
         while (group_iter->Next(info) && (CHIP_NO_ERROR == status))
         {
             // Group Key
-            KeysetId keyset_id = 0;
-            ReturnErrorOnFailure(groups->GetGroupKey(fabric_index, info.group_id, keyset_id));
+            KeysetId keyset_id = kInvalidKeysetId;
+            // Since keys are managed by the GroupKeyManagement cluster, groups may not have an associated keyset
+            status = groups->GetGroupKey(fabric_index, info.group_id, keyset_id).NoErrorIf(CHIP_ERROR_NOT_FOUND);
+            if (CHIP_NO_ERROR != status)
+            {
+                break;
+            }
 
             // Endpoints
             EndpointIterator * end_iter = groups->IterateEndpoints(fabric_index, info.group_id);
@@ -41,6 +66,17 @@ CHIP_ERROR GroupcastLogic::ReadMembership(const chip::Access::SubjectDescriptor
                 break;
             }
 
+            Groupcast::Structs::MembershipStruct::Type group;
+            group.fabricIndex     = fabric_index;
+            group.groupID         = info.group_id;
+            group.keySetID        = keyset_id;
+            group.mcastAddrPolicy = info.UsePerGroupAddress() ? Groupcast::MulticastAddrPolicyEnum::kPerGroup
+                                                              : Groupcast::MulticastAddrPolicyEnum::kIanaAddr;
+            if (mFeatures.Has(Groupcast::Feature::kListener))
+            {
+                group.hasAuxiliaryACL = MakeOptional(info.HasAuxiliaryACL());
+            }
+
             // Return endpoints in kMaxMembershipEndpoints chunks or less
             size_t group_total = end_iter->Count();
             size_t group_count = 0;
@@ -52,20 +88,22 @@ CHIP_ERROR GroupcastLogic::ReadMembership(const chip::Access::SubjectDescriptor
                 endpoints.entries[split_count++] = mapping.endpoint_id;
                 if ((group_count == group_total) || (split_count == kMaxMembershipEndpoints))
                 {
-                    Groupcast::Structs::MembershipStruct::Type group;
-                    group.fabricIndex     = fabric_index;
-                    group.groupID         = info.group_id;
-                    group.keySetID        = keyset_id;
-                    group.hasAuxiliaryACL = MakeOptional(info.flags & chip::to_underlying(GroupInfo::Flags::kHasAuxiliaryACL));
-                    group.mcastAddrPolicy = (info.flags & chip::to_underlying(GroupInfo::Flags::kMcastAddrPolicy)
-                                                 ? Groupcast::MulticastAddrPolicyEnum::kPerGroup
-                                                 : Groupcast::MulticastAddrPolicyEnum::kIanaAddr);
-                    group.endpoints       = MakeOptional(DataModel::List<const chip::EndpointId>(endpoints.entries, split_count));
-                    status                = encoder.Encode(group);
-                    split_count           = 0;
+                    group.endpoints = MakeOptional(DataModel::List<const chip::EndpointId>(endpoints.entries, split_count));
+                    status          = encoder.Encode(group);
+                    split_count     = 0;
                 }
             }
             end_iter->Release();
+            if (group_count == 0)
+            {
+                if (mFeatures.Has(Groupcast::Feature::kListener))
+                {
+                    // If listener is supported, the membership SHALL contain the endpoints list.
+                    group.endpoints = MakeOptional(DataModel::List<const chip::EndpointId>());
+                }
+
+                status = encoder.Encode(group);
+            }
         }
         group_iter->Release();
 
@@ -81,6 +119,17 @@ CHIP_ERROR GroupcastLogic::ReadMaxMembershipCount(EndpointId endpoint, Attribute
     return aEncoder.Encode(groups.getMaxMembershipCount());
 }
 
+CHIP_ERROR GroupcastLogic::ReadMaxMcastAddrCount(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    GroupDataProvider & groups = Provider();
+    return aEncoder.Encode(groups.getMaxMcastAddrCount());
+}
+
+CHIP_ERROR GroupcastLogic::ReadUsedMcastAddrCount(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    return aEncoder.Encode(mUsedMcastAddrCount);
+}
+
 Status GroupcastLogic::JoinGroup(FabricIndex fabric_index, const Groupcast::Commands::JoinGroup::DecodableType & data)
 {
     GroupDataProvider & groups = Provider();
@@ -112,12 +161,27 @@ Status GroupcastLogic::JoinGroup(FabricIndex fabric_index, const Groupcast::Comm
     }
     // Verify endpoint values
     {
-        auto iter = data.endpoints.begin();
+        // The endpoint list SHALL not contain the root endpoint and must be a valid endpoint on the device.
+        VerifyOrDie(mDataModelProvider != nullptr);
+        ReadOnlyBufferBuilder<DataModel::EndpointEntry> endpointsBuilder;
+        VerifyOrReturnError(CHIP_NO_ERROR == mDataModelProvider->Endpoints(endpointsBuilder), Status::Failure);
+        auto endpointsSpan = endpointsBuilder.TakeBuffer();
+        auto iter          = data.endpoints.begin();
         while (iter.Next())
         {
-            EndpointId ep = iter.GetValue();
-            VerifyOrReturnError((ep > 0) && (kInvalidEndpointId != ep), Status::ConstraintError);
-            // VerifyOrReturnError(nullptr != emberAfFindEndpointType(ep), Status::ConstraintError);
+            bool foundEndpoint = false;
+            EndpointId ep      = iter.GetValue();
+            VerifyOrReturnError((ep > kRootEndpointId), Status::UnsupportedEndpoint);
+            for (const auto & epEntry : endpointsSpan)
+            {
+                if (epEntry.id == ep)
+                {
+                    foundEndpoint = true;
+                    break;
+                }
+            }
+
+            VerifyOrReturnError(foundEndpoint, Status::UnsupportedEndpoint);
         }
     }
 
@@ -131,22 +195,8 @@ Status GroupcastLogic::JoinGroup(FabricIndex fabric_index, const Groupcast::Comm
     VerifyOrReturnError(new_count <= max_fabric_memberships, Status::ResourceExhausted);
 
     // Key handling
-    if (data.key.HasValue())
-    {
-        // Create a new keyset
-        Status stat = SetKeySet(fabric_index, data.keySetID, data.key.Value());
-        VerifyOrReturnError(Status::Success == stat, stat);
-    }
-    else
-    {
-        // The keyset must exist
-        GroupDataProvider::KeySet ks;
-        err = groups.GetKeySet(fabric_index, data.keySetID, ks);
-        VerifyOrReturnError(CHIP_NO_ERROR == err, Status::NotFound);
-    }
-    // Assign keyset to group
-    err = groups.SetGroupKey(fabric_index, data.groupID, data.keySetID);
-    VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
+    Status stat = SetKeySet(fabric_index, data.groupID, data.keySetID, data.key);
+    VerifyOrReturnError(Status::Success == stat, stat);
 
     // Add/update entry in the group table
     info.group_id = data.groupID;
@@ -197,18 +247,20 @@ Status GroupcastLogic::LeaveGroup(FabricIndex fabric_index, const Groupcast::Com
         // Apply changes to all groups
         GroupInfoIterator * iter = groups.IterateGroupInfo(fabric_index);
         VerifyOrReturnError(nullptr != iter, Status::ResourceExhausted);
+        VerifyOrReturnError(iter->Count() > 0, Status::NotFound);
 
         GroupInfo info;
         while (iter->Next(info) && (Status::Success == err))
         {
-            err = RemoveGroup(fabric_index, info.group_id, data, endpoints);
+            // For leave group, the leaveGroupResponse SHALL NOT contain the endpoints that were removed.
+            err = RemoveGroup(fabric_index, info.group_id, data, nullptr /* endpoints */);
         }
         iter->Release();
     }
     else
     {
         // Modify specific group
-        err = RemoveGroup(fabric_index, data.groupID, data, endpoints);
+        err = RemoveGroup(fabric_index, data.groupID, data, &endpoints);
     }
 
     return err;
@@ -216,18 +268,13 @@ Status GroupcastLogic::LeaveGroup(FabricIndex fabric_index, const Groupcast::Com
 
 Status GroupcastLogic::UpdateGroupKey(FabricIndex fabric_index, const Groupcast::Commands::UpdateGroupKey::DecodableType & data)
 {
-    GroupDataProvider & groups = Provider();
+    // Validate that the group exists early before trying to set the keyset
+    GroupDataProvider::GroupInfo info;
+    CHIP_ERROR err = Provider().GetGroupInfo(fabric_index, data.groupID, info);
+    VerifyOrReturnError(CHIP_ERROR_NOT_FOUND != err, Status::NotFound);
+    VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
 
-    // Key handling
-    if (data.key.HasValue())
-    {
-        // Create a new keyset
-        Status stat = SetKeySet(fabric_index, data.keySetID, data.key.Value());
-        VerifyOrReturnError(Status::Success == stat, stat);
-    }
-    // Assign keyset to group
-    CHIP_ERROR err = groups.SetGroupKey(fabric_index, data.groupID, data.keySetID);
-    return CHIP_NO_ERROR == err ? Status::Success : Status::Failure;
+    return SetKeySet(fabric_index, data.groupID, data.keySetID, data.key);
 }
 
 Status GroupcastLogic::ConfigureAuxiliaryACL(FabricIndex fabric_index,
@@ -236,6 +283,9 @@ Status GroupcastLogic::ConfigureAuxiliaryACL(FabricIndex fabric_index,
     GroupDataProvider & groups = Provider();
     CHIP_ERROR err             = CHIP_NO_ERROR;
 
+    // AuxiliaryACL can only be present if LN feature is supported
+    VerifyOrReturnError(mFeatures.Has(Groupcast::Feature::kListener), Status::ConstraintError);
+
     // Get group info
     GroupDataProvider::GroupInfo info;
     err = groups.GetGroupInfo(fabric_index, data.groupID, info);
@@ -256,15 +306,20 @@ Status GroupcastLogic::ConfigureAuxiliaryACL(FabricIndex fabric_index,
     return Status::Success;
 }
 
-Status GroupcastLogic::SetKeySet(FabricIndex fabric_index, KeysetId keyset_id, const chip::ByteSpan & key)
+Status GroupcastLogic::SetKeySet(FabricIndex fabric_index, GroupId group_id, KeysetId keyset_id,
+                                 const chip::Optional<chip::ByteSpan> & key)
 {
     GroupDataProvider & groups = Provider();
     GroupDataProvider::KeySet ks;
 
     CHIP_ERROR err = groups.GetKeySet(fabric_index, keyset_id, ks);
-    if (CHIP_ERROR_NOT_FOUND == err)
+    if (key.HasValue())
     {
-        // New key
+        // Key provided, the keyset must not exist
+        VerifyOrReturnError(CHIP_NO_ERROR != err, Status::AlreadyExists);
+        VerifyOrReturnError(CHIP_ERROR_NOT_FOUND == err, Status::Failure);
+
+        // Create new key
         const FabricInfo * fabric = Fabrics().FindFabricWithIndex(fabric_index);
         VerifyOrReturnValue(nullptr != fabric, Status::NotFound);
 
@@ -273,9 +328,8 @@ Status GroupcastLogic::SetKeySet(FabricIndex fabric_index, KeysetId keyset_id, c
         ks.num_keys_used = 1;
 
         GroupDataProvider::EpochKey & epoch = ks.epoch_keys[0];
-        VerifyOrReturnValue(key.size() == GroupDataProvider::EpochKey::kLengthBytes, Status::ConstraintError);
-        memcpy(epoch.key, key.data(), GroupDataProvider::EpochKey::kLengthBytes);
-
+        VerifyOrReturnValue(key.Value().size() == GroupDataProvider::EpochKey::kLengthBytes, Status::ConstraintError);
+        memcpy(epoch.key, key.Value().data(), GroupDataProvider::EpochKey::kLengthBytes);
         {
             // Get compressed fabric
             uint8_t compressed_fabric_id_buffer[sizeof(uint64_t)];
@@ -284,19 +338,26 @@ Status GroupcastLogic::SetKeySet(FabricIndex fabric_index, KeysetId keyset_id, c
             VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
             // Set keys
             err = groups.SetKeySet(fabric_index, compressed_fabric_id, ks);
+            VerifyOrReturnError(CHIP_ERROR_INVALID_LIST_LENGTH != err, Status::ResourceExhausted);
             VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
         }
     }
-    else if (CHIP_NO_ERROR == err)
+    else
     {
-        // Cannot set an existing key
-        return Status::AlreadyExists;
+        // No key provided, the keyset must exist
+        VerifyOrReturnError(CHIP_ERROR_NOT_FOUND != err, Status::NotFound);
+        VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
     }
+
+    // Assign keyset to group
+    err = groups.SetGroupKey(fabric_index, group_id, keyset_id);
+    VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
+
     return Status::Success;
 }
 
 Status GroupcastLogic::RemoveGroup(FabricIndex fabric_index, GroupId group_id,
-                                   const Groupcast::Commands::LeaveGroup::DecodableType & data, EndpointList & endpoints)
+                                   const Groupcast::Commands::LeaveGroup::DecodableType & data, EndpointList * endpoints)
 {
     GroupDataProvider & groups = Provider();
     Status stat                = Status::Success;
@@ -305,7 +366,7 @@ Status GroupcastLogic::RemoveGroup(FabricIndex fabric_index, GroupId group_id,
     {
         // Remove endpoints
         auto iter = data.endpoints.Value().begin();
-        while (iter.Next() && (endpoints.count < kMaxCommandEndpoints))
+        while (iter.Next())
         {
             auto endpoint_id = iter.GetValue();
             if (groups.HasEndpoint(fabric_index, group_id, endpoint_id))
@@ -317,17 +378,25 @@ Status GroupcastLogic::RemoveGroup(FabricIndex fabric_index, GroupId group_id,
     }
     else
     {
-        // Remove whole group (with all endpoints)
-        EndpointIterator * iter = groups.IterateEndpoints(fabric_index, data.groupID);
-        VerifyOrReturnError(nullptr != iter, Status::ResourceExhausted);
-        GroupEndpoint mapping;
-        while (iter->Next(mapping) && (endpoints.count < kMaxMembershipEndpoints))
+        if (endpoints != nullptr)
         {
-            stat = RemoveGroupEndpoint(fabric_index, group_id, mapping.endpoint_id, endpoints);
-            VerifyOrReturnError(Status::Success == stat, stat);
+            // Get the endpoints list for the LeaveGroupResponse
+            EndpointIterator * epIter = groups.IterateEndpoints(fabric_index, group_id);
+            VerifyOrReturnError(nullptr != epIter, Status::ResourceExhausted);
+
+            if (epIter->Count() <= kMaxCommandEndpoints)
+            {
+                GroupEndpoint ep;
+                while (epIter->Next(ep) && (endpoints->count < kMaxCommandEndpoints))
+                {
+                    endpoints->entries[endpoints->count++] = ep.endpoint_id;
+                }
+            }
+            epIter->Release();
         }
-        iter->Release();
-        CHIP_ERROR err = groups.RemoveGroupInfo(fabric_index, data.groupID);
+        // Remove whole group (with all endpoints)
+        CHIP_ERROR err = groups.RemoveGroupInfo(fabric_index, group_id);
+        VerifyOrReturnError(CHIP_ERROR_NOT_FOUND != err, Status::NotFound);
         VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
     }
 
@@ -335,25 +404,102 @@ Status GroupcastLogic::RemoveGroup(FabricIndex fabric_index, GroupId group_id,
 }
 
 Status GroupcastLogic::RemoveGroupEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id,
-                                           EndpointList & endpoints)
+                                           EndpointList * endpoints)
 {
     GroupDataProvider & groups = Provider();
 
-    CHIP_ERROR err = groups.RemoveEndpoint(fabric_index, group_id, endpoint_id);
+    CHIP_ERROR err = groups.RemoveEndpoint(fabric_index, group_id, endpoint_id,
+                                           mFeatures.Has(Groupcast::Feature::kSender)
+                                               ? GroupDataProvider::GroupCleanupPolicy::kKeepGroupIfEmpty
+                                               : GroupDataProvider::GroupCleanupPolicy::kDeleteGroupIfEmpty);
     VerifyOrReturnError(CHIP_NO_ERROR == err, Status::Failure);
+    VerifyOrReturnError(endpoints != nullptr, Status::Success);
 
     bool found = false;
-    for (size_t i = 0; !found && i < endpoints.count; ++i)
+    for (size_t i = 0; !found && i < endpoints->count; ++i)
     {
-        found = (endpoints.entries[i] == endpoint_id);
+        found = (endpoints->entries[i] == endpoint_id);
     }
     if (!found)
     {
-        endpoints.entries[endpoints.count++] = endpoint_id;
+        endpoints->entries[endpoints->count++] = endpoint_id;
     }
+
     return Status::Success;
 }
 
+void GroupcastLogic::OnGroupAdded(FabricIndex fabric_index, const GroupInfo & new_group)
+{
+    (void) fabric_index;
+    (void) new_group;
+    NotifyMembershipChanged();
+    NotifyUsedMcastAddrCountOnChange();
+}
+
+void GroupcastLogic::OnGroupRemoved(FabricIndex fabric_index, const GroupInfo & old_group)
+{
+    (void) fabric_index;
+    (void) old_group;
+    NotifyMembershipChanged();
+    NotifyUsedMcastAddrCountOnChange();
+}
+
+void GroupcastLogic::OnGroupModified(FabricIndex fabric_index, const GroupId & modified_group_id)
+{
+    (void) fabric_index;
+    (void) modified_group_id;
+    NotifyMembershipChanged();
+    NotifyUsedMcastAddrCountOnChange();
+}
+
+uint16_t GroupcastLogic::GetUsedMcastAddrCount()
+{
+    uint16_t per_group_count = 0;
+    uint16_t iana_address    = 0;
+    // Iterate all fabrics
+    for (const FabricInfo & fabric : Fabrics())
+    {
+        // Count distinct group addresses
+        GroupInfoIterator * iter = Provider().IterateGroupInfo(fabric.GetFabricIndex());
+        VerifyOrReturnValue(nullptr != iter, 0);
+        GroupInfo group;
+        while (iter->Next(group))
+        {
+            if (group.UsePerGroupAddress())
+            {
+                per_group_count++;
+            }
+            else
+            {
+                iana_address = 1;
+            }
+        }
+        iter->Release();
+    }
+    return per_group_count + iana_address;
+}
+
+void GroupcastLogic::NotifyMembershipChanged()
+{
+    if (mListener != nullptr)
+    {
+        mListener->OnMembershipChanged();
+    }
+}
+
+void GroupcastLogic::NotifyUsedMcastAddrCountOnChange()
+{
+    uint16_t new_count = GetUsedMcastAddrCount();
+    if (new_count != mUsedMcastAddrCount)
+    {
+        mUsedMcastAddrCount = new_count;
+        if (mListener != nullptr)
+        {
+            mListener->OnUsedMcastAddrCountChange();
+        }
+    }
+}
+
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/groupcast/GroupcastLogic.h b/src/app/clusters/groupcast/GroupcastLogic.h
index bb62859b259..d9108668308 100644
--- a/src/app/clusters/groupcast/GroupcastLogic.h
+++ b/src/app/clusters/groupcast/GroupcastLogic.h
@@ -40,8 +40,26 @@ using Status = chip::Protocols::InteractionModel::Status;
  * @brief Implements the Matter specifications for the Groupcast cluster
  */
 
-class GroupcastLogic
+class GroupcastLogic : public Credentials::GroupDataProvider::GroupListener
 {
+public:
+    /**
+     * @brief Interface to listen for changes in the per-group address count.
+     */
+    class Listener
+    {
+    public:
+        virtual ~Listener() = default;
+        /**
+         *  Callback invoked when membership changes (groups added or removed).
+         */
+        virtual void OnMembershipChanged() = 0;
+        /**
+         *  Callback invoked when used multicast addresses count changes.
+         */
+        virtual void OnUsedMcastAddrCountChange() = 0;
+    };
+
 public:
     static constexpr uint16_t kMaxMembershipEndpoints = 255;
     static constexpr uint16_t kMaxCommandEndpoints    = 20;
@@ -52,13 +70,16 @@ class GroupcastLogic
         uint16_t count = 0;
     };
 
-    GroupcastLogic(GroupcastContext & context) : mContext(context) {}
-    GroupcastLogic(GroupcastContext & context, BitFlags<Groupcast::Feature> features) : mContext(context), mFeatures(features) {}
+    GroupcastLogic(GroupcastContext & context);
+    GroupcastLogic(GroupcastContext & context, BitFlags<Groupcast::Feature> features);
+    ~GroupcastLogic() override;
     const BitFlags<Groupcast::Feature> & Features() const { return mFeatures; }
 
     CHIP_ERROR ReadMembership(const chip::Access::SubjectDescriptor * subject, EndpointId endpoint,
                               AttributeValueEncoder & aEncoder);
     CHIP_ERROR ReadMaxMembershipCount(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadMaxMcastAddrCount(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadUsedMcastAddrCount(EndpointId endpoint, AttributeValueEncoder & aEncoder);
 
     Status JoinGroup(FabricIndex fabric_index, const Groupcast::Commands::JoinGroup::DecodableType & data);
     Status LeaveGroup(FabricIndex fabric_index, const Groupcast::Commands::LeaveGroup::DecodableType & data,
@@ -66,17 +87,34 @@ class GroupcastLogic
     Status UpdateGroupKey(FabricIndex fabric_index, const Groupcast::Commands::UpdateGroupKey::DecodableType & data);
     Status ConfigureAuxiliaryACL(FabricIndex fabric_index, const Groupcast::Commands::ConfigureAuxiliaryACL::DecodableType & data);
 
+    void SetDataModelProvider(DataModel::Provider & provider) { mDataModelProvider = &provider; }
+    void ResetDataModelProvider() { mDataModelProvider = nullptr; }
+
+    // Listener
+    void SetListener(Listener * listener) { mListener = listener; }
+    void RemoveListener() { mListener = nullptr; }
+
 private:
-    Credentials::GroupDataProvider & Provider() { return mContext.provider; }
-    chip::FabricTable & Fabrics() { return mContext.fabrics; }
+    Credentials::GroupDataProvider & Provider() { return mContext.groupDataProvider; }
+    chip::FabricTable & Fabrics() { return mContext.fabricTable; }
 
-    Status SetKeySet(FabricIndex fabric_index, KeysetId keyset_id, const chip::ByteSpan & key);
+    Status SetKeySet(FabricIndex fabric_index, GroupId group_id, KeysetId keyset_id, const chip::Optional<chip::ByteSpan> & key);
     Status RemoveGroup(FabricIndex fabric_index, GroupId group_id, const Groupcast::Commands::LeaveGroup::DecodableType & data,
-                       EndpointList & endpoints);
-    Status RemoveGroupEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id, EndpointList & endpoints);
+                       EndpointList * endpoints);
+    Status RemoveGroupEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id, EndpointList * endpoints);
+    uint16_t GetUsedMcastAddrCount();
+    // GroupListener implementation
+    void OnGroupAdded(FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & new_group) override;
+    void OnGroupRemoved(FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & old_group) override;
+    void OnGroupModified(FabricIndex fabric_index, const GroupId & modified_group_id) override;
+    void NotifyUsedMcastAddrCountOnChange();
+    void NotifyMembershipChanged();
 
     GroupcastContext & mContext;
     const BitFlags<Groupcast::Feature> mFeatures;
+    DataModel::Provider * mDataModelProvider = nullptr;
+    uint16_t mUsedMcastAddrCount             = 0;
+    Listener * mListener                     = nullptr;
 };
 
 } // namespace Clusters
diff --git a/src/app/clusters/groupcast/app_config_dependent_sources.cmake b/src/app/clusters/groupcast/app_config_dependent_sources.cmake
index 47f3fc83a7e..6981c76119a 100644
--- a/src/app/clusters/groupcast/app_config_dependent_sources.cmake
+++ b/src/app/clusters/groupcast/app_config_dependent_sources.cmake
@@ -19,12 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/GroupcastCluster.cpp"
-    "${CLUSTER_DIR}/GroupcastCluster.h"
-    "${CLUSTER_DIR}/GroupcastLogic.cpp"
-    "${CLUSTER_DIR}/GroupcastLogic.h"
-)
diff --git a/src/app/clusters/groupcast/tests/BUILD.gn b/src/app/clusters/groupcast/tests/BUILD.gn
index f15f8e717b8..20740c872bb 100644
--- a/src/app/clusters/groupcast/tests/BUILD.gn
+++ b/src/app/clusters/groupcast/tests/BUILD.gn
@@ -27,7 +27,11 @@ chip_test_suite("tests") {
   public_deps = [
     "${chip_root}/src/app/clusters/groupcast",
     "${chip_root}/src/app/server-cluster/testing",
+    "${chip_root}/src/app/tests:helpers",
+    "${chip_root}/src/app/util/mock:mock_codegen_data_model",
+    "${chip_root}/src/app/util/mock:mock_ember",
     "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support",
+    "${chip_root}/src/lib/support:timer-delegate-mock",
   ]
 }
diff --git a/src/app/clusters/groupcast/tests/TestGroupcastCluster.cpp b/src/app/clusters/groupcast/tests/TestGroupcastCluster.cpp
index d9b7b6d4df0..9a725b96be2 100644
--- a/src/app/clusters/groupcast/tests/TestGroupcastCluster.cpp
+++ b/src/app/clusters/groupcast/tests/TestGroupcastCluster.cpp
@@ -25,6 +25,8 @@
 #include <app/server-cluster/testing/MockCommandHandler.h>
 #include <app/server-cluster/testing/TestServerClusterContext.h>
 #include <app/server-cluster/testing/ValidateGlobalAttributes.h>
+#include <app/util/mock/Constants.h>
+#include <app/util/mock/Functions.h>
 #include <clusters/Groupcast/Enums.h>
 #include <clusters/Groupcast/Metadata.h>
 #include <credentials/GroupDataProviderImpl.h>
@@ -33,23 +35,29 @@
 #include <lib/support/BitFlags.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ReadOnlyBuffer.h>
+#include <lib/support/TimerDelegateMock.h>
 #include <platform/NetworkCommissioning.h>
 
+#include <array>
 #include <credentials/GroupDataProviderImpl.h>
 #include <crypto/DefaultSessionKeystore.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
+#include <set>
 
 namespace {
 
 using namespace chip;
+using namespace chip::app;
 using namespace chip::Testing;
 using namespace chip::Credentials;
 using namespace chip::app::Clusters::Groupcast;
+using namespace chip::System::Clock::Literals;
 using chip::Testing::IsAcceptedCommandsListEqualTo;
 using chip::Testing::IsAttributesListEqualTo;
 
 using chip::app::DataModel::AcceptedCommandEntry;
 using chip::app::DataModel::AttributeEntry;
+static constexpr size_t kMaxMembershipEndpoints = app::Clusters::GroupcastLogic::kMaxMembershipEndpoints;
 
 template <typename DecodableListType>
 CHIP_ERROR CountListElements(DecodableListType & list, size_t & count)
@@ -65,20 +73,38 @@ CHIP_ERROR CountListElements(DecodableListType & list, size_t & count)
 }
 
 chip::FabricIndex kTestFabricIndex = Testing::kTestFabricIndex;
+class CustomDataModel : public EmptyProvider
+{
+public:
+    // Override of the EmptyProvider to mock a large Endpoint list in the data model that will be used in the following tests.
+    CHIP_ERROR Endpoints(ReadOnlyBufferBuilder<DataModel::EndpointEntry> & builder) override
+    {
+        static constexpr size_t kEndpointCount                                       = 300;
+        static const std::array<DataModel::EndpointEntry, kEndpointCount> kEndpoints = []() {
+            std::array<DataModel::EndpointEntry, kEndpointCount> endpoints;
+
+            for (size_t i = 0; i < kEndpointCount; i++)
+            {
+                endpoints[i] = DataModel::EndpointEntry{
+                    .id                 = static_cast<EndpointId>(i + 1),
+                    .parentId           = kInvalidEndpointId,
+                    .compositionPattern = DataModel::EndpointCompositionPattern::kTree,
+                };
+            }
+
+            return endpoints;
+        }();
+
+        return builder.ReferenceExisting(Span<const DataModel::EndpointEntry>(kEndpoints.data(), kEndpoints.size()));
+    }
+};
 
 // initialize memory as ReadOnlyBufferBuilder may allocate
 struct TestGroupcastCluster : public ::testing::Test
 {
-    static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
-    static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
+    static void SetUpTestSuite() { ASSERT_EQ(Platform::MemoryInit(), CHIP_NO_ERROR); }
 
-    TestServerClusterContext mTestContext;
-    Credentials::GroupDataProviderImpl mProvider;
-    Crypto::DefaultSessionKeystore mKeystore;
-    FabricTestFixture mFabricHelper{ &mTestContext.StorageDelegate() };
-    app::Clusters::GroupcastCluster mSender{ { mFabricHelper.GetFabricTable(), mProvider }, BitFlags<Feature>{ Feature::kSender } };
-    app::Clusters::GroupcastCluster mListener{ { mFabricHelper.GetFabricTable(), mProvider },
-                                               BitFlags<Feature>{ Feature::kListener } };
+    static void TearDownTestSuite() { Platform::MemoryShutdown(); }
 
     void SetUp() override
     {
@@ -86,8 +112,18 @@ struct TestGroupcastCluster : public ::testing::Test
         mProvider.SetSessionKeystore(&mKeystore);
         ASSERT_EQ(mProvider.Init(), CHIP_NO_ERROR);
 
-        ASSERT_EQ(mSender.Startup(mTestContext.Get()), CHIP_NO_ERROR);
-        ASSERT_EQ(mListener.Startup(mTestContext.Get()), CHIP_NO_ERROR);
+        // Replace the DataModel Provider in the ServerClusterContext provided to the cluster implementation
+        // with our Mock DataModel Provider so we can test endpoints validations on JoinGroup command.
+        ServerClusterContext context = mTestContext.Get();
+        clusterContext               = std::make_unique<ServerClusterContext>(ServerClusterContext{
+                          .provider           = customDataModel,
+                          .storage            = context.storage,
+                          .attributeStorage   = context.attributeStorage,
+                          .interactionContext = context.interactionContext,
+        });
+
+        ASSERT_EQ(mSender.Startup(*clusterContext), CHIP_NO_ERROR);
+        ASSERT_EQ(mListener.Startup(*clusterContext), CHIP_NO_ERROR);
 
         CHIP_ERROR err = mFabricHelper.SetUpTestFabric(kTestFabricIndex);
         ASSERT_EQ(err, CHIP_NO_ERROR);
@@ -98,6 +134,7 @@ struct TestGroupcastCluster : public ::testing::Test
     {
         mSender.Shutdown(app::ClusterShutdownType::kClusterShutdown);
         mListener.Shutdown(app::ClusterShutdownType::kClusterShutdown);
+        clusterContext.reset();
         Credentials::SetGroupDataProvider(nullptr);
         CHIP_ERROR err = mFabricHelper.TearDownTestFabric(kTestFabricIndex);
         ASSERT_EQ(err, CHIP_NO_ERROR);
@@ -111,6 +148,18 @@ struct TestGroupcastCluster : public ::testing::Test
         EXPECT_EQ(status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   expected);
     }
+
+    TestServerClusterContext mTestContext;
+    Credentials::GroupDataProviderImpl mProvider;
+    TimerDelegateMock mMockTimerDelegate;
+    Crypto::DefaultSessionKeystore mKeystore;
+    CustomDataModel customDataModel;
+    std::unique_ptr<ServerClusterContext> clusterContext;
+    FabricTestFixture mFabricHelper{ &mTestContext.StorageDelegate() };
+    app::Clusters::GroupcastCluster mSender{ { mFabricHelper.GetFabricTable(), mProvider, mMockTimerDelegate },
+                                             BitFlags<Feature>{ Feature::kSender } };
+    app::Clusters::GroupcastCluster mListener{ { mFabricHelper.GetFabricTable(), mProvider, mMockTimerDelegate },
+                                               BitFlags<Feature>{ Feature::kListener } };
 };
 
 TEST_F(TestGroupcastCluster, TestAttributes)
@@ -141,6 +190,53 @@ TEST_F(TestGroupcastCluster, TestAttributes)
     }
 }
 
+void ValidateMembership(const Attributes::Membership::TypeInfo::DecodableType & memberships,
+                        const Clusters::Groupcast::Structs::MembershipStruct::Type * expectedMemberships,
+                        size_t expectedMembershipsCount)
+{
+    size_t membershipCount = 0;
+    ASSERT_EQ(CountListElements(memberships, membershipCount), CHIP_NO_ERROR);
+    ASSERT_EQ(membershipCount, expectedMembershipsCount);
+
+    size_t index        = 0;
+    auto iterMembership = memberships.begin();
+    while (iterMembership.Next() && (index < expectedMembershipsCount))
+    {
+        auto membership = iterMembership.GetValue();
+        ASSERT_EQ(membership.groupID, expectedMemberships[index].groupID);
+        ASSERT_EQ(membership.keySetID, expectedMemberships[index].keySetID);
+        ASSERT_EQ(membership.mcastAddrPolicy, expectedMemberships[index].mcastAddrPolicy);
+        ASSERT_EQ(membership.hasAuxiliaryACL.HasValue(), expectedMemberships[index].hasAuxiliaryACL.HasValue());
+        if (expectedMemberships[index].hasAuxiliaryACL.HasValue())
+        {
+            ASSERT_EQ(membership.hasAuxiliaryACL, expectedMemberships[index].hasAuxiliaryACL);
+        }
+
+        ASSERT_EQ(membership.endpoints.HasValue(), expectedMemberships[index].endpoints.HasValue());
+        if (membership.endpoints.HasValue())
+        {
+            size_t endpoint_count = 0;
+            ASSERT_EQ(membership.endpoints.Value().ComputeSize(&endpoint_count), CHIP_NO_ERROR);
+            ASSERT_EQ(endpoint_count, expectedMemberships[index].endpoints.Value().size());
+            // Build set from expected endpoints
+            std::set<EndpointId> expectedEndpoints;
+            for (size_t i = 0; i < expectedMemberships[index].endpoints.Value().size(); i++)
+            {
+                expectedEndpoints.insert(expectedMemberships[index].endpoints.Value()[i]);
+            }
+            // Check each actual endpoint is in the expected set
+            auto iterEndpoints = membership.endpoints.Value().begin();
+            while (iterEndpoints.Next())
+            {
+                auto endpoint = iterEndpoints.GetValue();
+                ASSERT_NE(expectedEndpoints.find(endpoint), expectedEndpoints.end());
+            }
+        }
+        index++;
+    }
+    ASSERT_EQ(index, membershipCount);
+}
+
 TEST_F(TestGroupcastCluster, TestAcceptedCommands)
 {
     ASSERT_TRUE(IsAcceptedCommandsListEqualTo(mListener,
@@ -149,13 +245,15 @@ TEST_F(TestGroupcastCluster, TestAcceptedCommands)
                                                   Commands::LeaveGroup::kMetadataEntry,
                                                   Commands::UpdateGroupKey::kMetadataEntry,
                                                   Commands::ConfigureAuxiliaryACL::kMetadataEntry,
+                                                  Commands::GroupcastTesting::kMetadataEntry,
                                               }));
 }
 
 TEST_F(TestGroupcastCluster, TestReadMembership)
 {
-    static constexpr uint16_t kMaxEndpoints = app::Clusters::GroupcastLogic::kMaxCommandEndpoints;
-    static constexpr uint16_t kIntervals    = 15;
+    static constexpr uint16_t kMaxEndpoints   = app::Clusters::GroupcastLogic::kMaxCommandEndpoints;
+    static constexpr uint16_t kIntervals      = 15;
+    static constexpr uint16_t kTotalEndpoints = kMaxEndpoints * kIntervals;
     const uint8_t key[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
     const EndpointId kEndpoints[kIntervals][kMaxEndpoints] = {
         { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 },
@@ -174,8 +272,11 @@ TEST_F(TestGroupcastCluster, TestReadMembership)
         { 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280 },
         { 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300 }
     };
-    GroupId kGroup1 = 0xab01;
-    GroupId kGroup2 = 0xcd02;
+    GroupId kGroup1   = 0xab01;
+    GroupId kGroup2   = 0xcd02;
+    GroupId kGroup3   = 0xef03;
+    KeysetId kKeyset1 = 0xabcd;
+    KeysetId kKeyset2 = 0xcafe;
 
     chip::Testing::ClusterTester tester(mListener);
     tester.SetFabricIndex(kTestFabricIndex);
@@ -184,11 +285,11 @@ TEST_F(TestGroupcastCluster, TestReadMembership)
     {
         Commands::JoinGroup::Type data;
         data.groupID         = kGroup1;
-        data.keySetID        = 0xabcd;
+        data.keySetID        = kKeyset1;
         data.key             = MakeOptional(ByteSpan(key));
         data.useAuxiliaryACL = MakeOptional(true);
         data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr);
-        data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints);
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints);
 
         auto result = tester.Invoke(Commands::JoinGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
@@ -197,7 +298,7 @@ TEST_F(TestGroupcastCluster, TestReadMembership)
         data.key.ClearValue();
         for (int i = 1; i < kIntervals; i++)
         {
-            data.endpoints = chip::app::DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
+            data.endpoints = DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
             result         = tester.Invoke(Commands::JoinGroup::Id, data);
             ASSERT_TRUE(result.status.has_value());
             EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
@@ -209,62 +310,259 @@ TEST_F(TestGroupcastCluster, TestReadMembership)
         data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup);
         for (int i = 0; i < 2; i++)
         {
-            data.endpoints = chip::app::DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
+            data.endpoints = DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
             result         = tester.Invoke(Commands::JoinGroup::Id, data);
             ASSERT_TRUE(result.status.has_value());
             EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                       Protocols::InteractionModel::Status::Success);
         }
+
+        // Join group 3
+        data.groupID         = kGroup3;
+        data.keySetID        = kKeyset2;
+        data.key             = MakeOptional(ByteSpan(key));
+        data.useAuxiliaryACL = MakeOptional(false);
+        data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup);
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints[4], 8);
+        result               = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
     }
 
+    // Remove keyset used by Group 2
+    EXPECT_EQ(CHIP_NO_ERROR, mProvider.RemoveKeySet(kTestFabricIndex, kKeyset2));
+
     // Read Membership
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
 
-        size_t memershipCount = 0;
-        ASSERT_EQ(CountListElements(memberships, memershipCount), CHIP_NO_ERROR);
-        ASSERT_EQ(memershipCount, 3u); // Group1 [1..255], Group1 [256..300], Group2 [1..40]
+        // Build expected endpoint arrays
+        // Group1 chunk 1: first kMaxMembershipEndpoints endpoints (intervals 0-12, plus 15 from interval 13 = 255 endpoints)
+        EndpointId group1_chunk1[kMaxMembershipEndpoints];
+        for (size_t i = 0; i < kMaxMembershipEndpoints; i++)
+        {
+            group1_chunk1[i] = static_cast<EndpointId>(i + 1);
+        }
 
-        GroupId expected_groups[]          = { kGroup1, kGroup1, kGroup2 };
-        GroupId expected_endpoint_counts[] = { 255, 45, 40 };
-        GroupId prev_group                 = kGroup1;
-        size_t i = 0, j = 0;
-        auto iter = memberships.begin();
-        while (iter.Next())
+        // Group1 chunk 2: remaining 45 endpoints (last 5 from interval 13, plus all 20 from interval 14)
+        EndpointId group1_chunk2[kTotalEndpoints - kMaxMembershipEndpoints];
+        for (size_t i = 0; i < MATTER_ARRAY_SIZE(group1_chunk2); i++)
         {
-            auto item             = iter.GetValue();
-            size_t endpoint_count = 0;
-            // Check group
-            ASSERT_EQ(item.groupID, expected_groups[i]);
-            ASSERT_TRUE(item.hasAuxiliaryACL.HasValue());
-            ASSERT_EQ(item.hasAuxiliaryACL.Value(), item.groupID == kGroup1);
-            ChipLogProgress(Crypto, "~~~ g:#%04x, a:%u, p:%u", (unsigned) item.groupID, (unsigned) item.hasAuxiliaryACL.Value(),
-                            (unsigned) item.mcastAddrPolicy);
-            ASSERT_EQ(item.mcastAddrPolicy,
-                      item.groupID == kGroup1 ? app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr
-                                              : app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup);
-            // Check endpoint count
-            ASSERT_TRUE(item.endpoints.HasValue());
-            ASSERT_EQ(item.endpoints.Value().ComputeSize(&endpoint_count), CHIP_NO_ERROR);
-            ASSERT_EQ(endpoint_count, expected_endpoint_counts[i]);
-            // Check individual endpoints
-            if (item.groupID != prev_group)
+            group1_chunk2[i] = static_cast<EndpointId>(kMaxMembershipEndpoints + i + 1);
+        }
+
+        // Group2: 40 endpoints from intervals 1-2
+        EndpointId group2_endpoints[2 * kMaxEndpoints];
+        for (size_t i = 0; i < 2 * kMaxEndpoints; i++)
+        {
+            group2_endpoints[i] = static_cast<EndpointId>(i + 1);
+        }
+
+        // Group3: 8 endpoints from interval 4
+        EndpointId group3_endpoints[8];
+        for (size_t i = 0; i < 8; i++)
+        {
+            group3_endpoints[i] = static_cast<EndpointId>(4 * kMaxEndpoints + i + 1);
+        }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
             {
-                // Reset endpoint idex for the new group
-                j = 0;
-            }
-            auto iter2 = item.endpoints.Value().begin();
-            while (iter2.Next())
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(group1_chunk1, kMaxMembershipEndpoints)),
+                .keySetID        = kKeyset1,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(group1_chunk2, MATTER_ARRAY_SIZE(group1_chunk2))),
+                .keySetID        = kKeyset1,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID   = kGroup2,
+                .endpoints = MakeOptional(DataModel::List<const EndpointId>(group2_endpoints, MATTER_ARRAY_SIZE(group2_endpoints))),
+                .keySetID  = kKeyset1,
+                .hasAuxiliaryACL = MakeOptional(false),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup,
+            },
             {
-                EndpointId endpoint_id = iter2.GetValue();
-                EndpointId expected_id = kEndpoints[j / kMaxEndpoints][j % kMaxEndpoints];
-                ASSERT_EQ(endpoint_id, expected_id);
-                j++;
+                .groupID   = kGroup3,
+                .endpoints = MakeOptional(DataModel::List<const EndpointId>(group3_endpoints, MATTER_ARRAY_SIZE(group3_endpoints))),
+                .keySetID  = kInvalidKeysetId,
+                .hasAuxiliaryACL = MakeOptional(false),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup,
             }
-            prev_group = item.groupID;
-            i++;
-        }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+}
+
+TEST_F(TestGroupcastCluster, TestReadUsedMcastAddrCount)
+{
+    const uint8_t key[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
+    const EndpointId kEndpoints[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+    GroupId kGroup1               = 0xab01;
+    GroupId kGroup2               = 0xcd02;
+    GroupId kGroup3               = 0xef03;
+    GroupId kGroup4               = 0xff04;
+    KeysetId kKeyset              = 0xabcd;
+
+    constexpr System::Clock::Milliseconds32 kChangeTemporisation = System::Clock::Milliseconds32(251);
+    chip::Testing::ClusterTester tester(mListener);
+    tester.SetFabricIndex(kTestFabricIndex);
+
+    app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::TypeInfo::DecodableType multicastAddrCount;
+    app::ConcreteAttributePath membershipAttributePath(kRootEndpointId, app::Clusters::Groupcast::Id,
+                                                       app::Clusters::Groupcast::Attributes::Membership::Id);
+    app::ConcreteAttributePath usedMcastAddrCountAttributePath(kRootEndpointId, app::Clusters::Groupcast::Id,
+                                                               app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id);
+    ASSERT_FALSE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+    ASSERT_FALSE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+    // Read UsedMcastAddrCount
+    ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+              CHIP_NO_ERROR);
+    ASSERT_EQ(multicastAddrCount, 0u);
+
+    // Join groups
+    {
+        // Group 1 (IanaAddr)
+        Commands::JoinGroup::Type data;
+        data.groupID         = kGroup1;
+        data.keySetID        = kKeyset;
+        data.key             = MakeOptional(ByteSpan(key));
+        data.useAuxiliaryACL = MakeOptional(true);
+        data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr);
+        data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints);
+
+        auto result = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 1u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 2 (PerGroup)
+        data.groupID = kGroup2;
+        data.key.ClearValue();
+        data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kPerGroup);
+        result               = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 2u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 3 (PerGroup)
+        data.groupID = kGroup3;
+        result       = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 3u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 4 (IanaAddr)
+        data.groupID         = kGroup4;
+        data.mcastAddrPolicy = MakeOptional(app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr);
+        result               = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_FALSE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 3u);
+        mTestContext.ChangeListener().DirtyList().clear();
+    }
+
+    // Leave groups
+    {
+        // Group 2 (PerGroup)
+        Commands::LeaveGroup::Type data;
+        data.groupID = kGroup2;
+        auto result  = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 2u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 1 (IanaAddr)
+        data.groupID = kGroup1;
+        result       = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_FALSE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 2u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 3 (PerGroup)
+        data.groupID = kGroup3;
+        result       = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 1u);
+        mTestContext.ChangeListener().DirtyList().clear();
+
+        // Group 4 (IanaAddr)
+        data.groupID = kGroup4;
+        result       = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        mMockTimerDelegate.AdvanceClock(System::Clock::Milliseconds64(kChangeTemporisation));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(membershipAttributePath));
+        ASSERT_TRUE(mTestContext.ChangeListener().IsDirty(usedMcastAddrCountAttributePath));
+        // Read UsedMcastAddrCount
+        ASSERT_EQ(tester.ReadAttribute(app::Clusters::Groupcast::Attributes::UsedMcastAddrCount::Id, multicastAddrCount),
+                  CHIP_NO_ERROR);
+        ASSERT_EQ(multicastAddrCount, 0u);
+        mTestContext.ChangeListener().DirtyList().clear();
     }
 }
 
@@ -272,13 +570,26 @@ TEST_F(TestGroupcastCluster, TestJoinGroupCommand)
 {
     const uint8_t key[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
     const EndpointId kEndpoints[] = { 1 };
+    const KeysetId kKeyset        = 0xabcd;
 
     Commands::JoinGroup::Type data;
     data.groupID         = 1;
-    data.keySetID        = 0xabcd;
+    data.keySetID        = kKeyset;
     data.key             = MakeOptional(ByteSpan(key));
     data.useAuxiliaryACL = MakeOptional(true);
-    data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
+    data.endpoints       = DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
+
+    // Neither Listener, nor Sender
+    {
+        app::Clusters::GroupcastCluster cluster({ mFabricHelper.GetFabricTable(), mProvider, mMockTimerDelegate });
+        chip::Testing::ClusterTester tester(cluster);
+        tester.SetFabricIndex(kTestFabricIndex);
+
+        auto result = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::ConstraintError);
+    }
 
     // Listener
     {
@@ -313,13 +624,31 @@ TEST_F(TestGroupcastCluster, TestJoinGroupCommand)
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::Success);
+
+        // Join group with root endpoint: Invalid Endpoint
+        const EndpointId kRootEndpoint[] = { kRootEndpointId };
+        data.groupID                     = 3;
+        data.endpoints                   = DataModel::List<const EndpointId>(kRootEndpoint, MATTER_ARRAY_SIZE(kRootEndpoint));
+        result                           = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::UnsupportedEndpoint);
+
+        // Join group with an invalid endpoint in the data model
+        const EndpointId kInvalidEndpoint[] = { 301 };
+        data.groupID                        = 3;
+        data.endpoints = DataModel::List<const EndpointId>(kInvalidEndpoint, MATTER_ARRAY_SIZE(kInvalidEndpoint));
+        result         = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::UnsupportedEndpoint);
     }
 
     // Sender
     {
         chip::Testing::ClusterTester tester(mSender);
         tester.SetFabricIndex(kTestFabricIndex);
-        data.endpoints = chip::app::DataModel::List<const EndpointId>();
+        data.endpoints = DataModel::List<const EndpointId>();
 
         // Join group: UseAuxiliaryACL can't be set
         auto result = tester.Invoke(Commands::JoinGroup::Id, data);
@@ -336,7 +665,7 @@ TEST_F(TestGroupcastCluster, TestJoinGroupCommand)
 
         // Join group: Non-empty endpoints
         data.groupID   = 3;
-        data.endpoints = chip::app::DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
+        data.endpoints = DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
         result         = tester.Invoke(Commands::JoinGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
@@ -363,21 +692,29 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
     static const std::set<EndpointId> kRemoveSet1(std::begin(kLeaveEndpoints1), std::end(kLeaveEndpoints1));
     static const std::set<EndpointId> kRemoveSet2(std::begin(kLeaveEndpoints2), std::end(kLeaveEndpoints2));
 
-    GroupId kGroup1 = 0xab01;
-    GroupId kGroup2 = kGroup1 + 1;
+    GroupId kGroup1  = 0xab01;
+    GroupId kGroup2  = 0xcd02;
+    GroupId kGroup3  = 0xef03;
+    KeysetId kKeyset = 0xabcd;
 
     chip::Testing::ClusterTester tester(mListener);
     tester.SetFabricIndex(kTestFabricIndex);
 
-    // Join grojups
+    EndpointId all_endpoints[kTotalEndpoints];
+    for (size_t i = 0; i < kTotalEndpoints; i++)
+    {
+        all_endpoints[i] = static_cast<EndpointId>(i + 1);
+    }
+
+    // Join groups
     {
         // Group 1
         Commands::JoinGroup::Type data;
         data.groupID         = kGroup1;
-        data.keySetID        = 0xabcd;
+        data.keySetID        = kKeyset;
         data.key             = MakeOptional(ByteSpan(key));
         data.useAuxiliaryACL = MakeOptional(true);
-        data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints);
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints);
 
         auto result = tester.Invoke(Commands::JoinGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
@@ -386,7 +723,7 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         data.key.ClearValue();
         for (int i = 1; i < kIntervals; i++)
         {
-            data.endpoints = chip::app::DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
+            data.endpoints = DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
             result         = tester.Invoke(Commands::JoinGroup::Id, data);
             ASSERT_TRUE(result.status.has_value());
             EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
@@ -397,7 +734,7 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         data.useAuxiliaryACL = MakeOptional(false);
         for (int i = 0; i < kIntervals; i++)
         {
-            data.endpoints = chip::app::DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
+            data.endpoints = DataModel::List<const EndpointId>(kEndpoints[i], kMaxEndpoints);
             result         = tester.Invoke(Commands::JoinGroup::Id, data);
             ASSERT_TRUE(result.status.has_value());
             EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
@@ -410,35 +747,25 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
 
-        size_t memershipCount = 0;
-        ASSERT_EQ(CountListElements(memberships, memershipCount), CHIP_NO_ERROR);
-        ASSERT_EQ(memershipCount, 2u); // Group1 [1..255], Group1 [256..300], Group2 [1..40]
-
-        GroupId group_id = kGroup1;
-        auto iter        = memberships.begin();
-        while (iter.Next())
-        {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, group_id);
-            // Check the endpoints are still in the group
-            size_t found          = 0;
-            size_t endpoint_count = 0;
-            // Check endpoint count
-            ASSERT_TRUE(item.endpoints.HasValue());
-            ASSERT_EQ(item.endpoints.Value().ComputeSize(&endpoint_count), CHIP_NO_ERROR);
-            ASSERT_EQ(endpoint_count, kTotalEndpoints);
-            // Check endpoints are stil in the group
-            auto iter2 = item.endpoints.Value().begin();
-            while (iter2.Next())
+        // Build expected endpoint arrays - both groups have all 100 endpoints
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(all_endpoints, kTotalEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
             {
-                if (kRemoveSet1.find(iter2.GetValue()) != kRemoveSet1.end())
-                {
-                    found++;
-                }
+                .groupID         = kGroup2,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(all_endpoints, kTotalEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(false),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
             }
-            ASSERT_EQ(found, kRemoveSet1.size());
-            group_id++;
-        }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 
     // LeaveGroup
@@ -446,10 +773,9 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         Commands::LeaveGroup::Type data;
 
         // Update existing key (invalid)
-        data.groupID = kGroup1;
-        data.endpoints =
-            MakeOptional(chip::app::DataModel::List<const EndpointId>(kLeaveEndpoints1, MATTER_ARRAY_SIZE(kLeaveEndpoints1)));
-        auto result = tester.Invoke(Commands::LeaveGroup::Id, data);
+        data.groupID   = kGroup1;
+        data.endpoints = MakeOptional(DataModel::List<const EndpointId>(kLeaveEndpoints1, MATTER_ARRAY_SIZE(kLeaveEndpoints1)));
+        auto result    = tester.Invoke(Commands::LeaveGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::Success);
@@ -460,49 +786,47 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
 
-        size_t memershipCount = 0;
-        ASSERT_EQ(CountListElements(memberships, memershipCount), CHIP_NO_ERROR);
-        ASSERT_EQ(memershipCount, 2u); // Group1 [1..255], Group1 [256..300], Group2 [1..40]
-
-        GroupId group_id = kGroup1;
-        auto iter        = memberships.begin();
-        while (iter.Next())
+        // Build expected endpoint arrays
+        // Group1: all endpoints except kLeaveEndpoints1 (100 - 8 = 92 endpoints)
+        EndpointId group1_endpoints[kTotalEndpoints - MATTER_ARRAY_SIZE(kLeaveEndpoints1)];
+        for (size_t i = 0, j = 0; (i < kTotalEndpoints) && (j < MATTER_ARRAY_SIZE(group1_endpoints)); i++)
         {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, group_id);
-            // Check the endpoints are still in the group
-            size_t found          = 0;
-            size_t endpoint_count = 0;
-            // Check endpoint count
-
-            size_t expected_count = (kGroup1 == group_id) ? kTotalEndpoints - kRemoveSet1.size() : kTotalEndpoints;
-            ASSERT_TRUE(item.endpoints.HasValue());
-            ASSERT_EQ(item.endpoints.Value().ComputeSize(&endpoint_count), CHIP_NO_ERROR);
-            ASSERT_EQ(endpoint_count, expected_count);
-            // Check endpoints are stil in the group
-            auto iter2 = item.endpoints.Value().begin();
-            while (iter2.Next())
+            EndpointId ep = static_cast<EndpointId>(i + 1);
+            if (kRemoveSet1.find(ep) == kRemoveSet1.end())
             {
-                if (kRemoveSet1.find(iter2.GetValue()) != kRemoveSet1.end())
-                {
-                    found++;
-                }
+                group1_endpoints[j++] = ep;
             }
-            // Endpoints removed from group 1, but not from group 2
-            ASSERT_EQ(found, kGroup1 == group_id ? 0 : kRemoveSet1.size());
-            group_id++;
         }
+
+        // Group2: all endpoints (100 endpoints)
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID   = kGroup1,
+                .endpoints = MakeOptional(DataModel::List<const EndpointId>(group1_endpoints, MATTER_ARRAY_SIZE(group1_endpoints))),
+                .keySetID  = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup2,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(all_endpoints, kTotalEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(false),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 
-    // LeaveGroup (all)
+    // LeaveGroup a List of endpoints from all groups
     {
         Commands::LeaveGroup::Type data;
 
-        // Update existing key (invalid)
-        data.groupID = 0;
-        data.endpoints =
-            MakeOptional(chip::app::DataModel::List<const EndpointId>(kLeaveEndpoints2, MATTER_ARRAY_SIZE(kLeaveEndpoints2)));
-        auto result = tester.Invoke(Commands::LeaveGroup::Id, data);
+        data.groupID   = 0;
+        data.endpoints = MakeOptional(DataModel::List<const EndpointId>(kLeaveEndpoints2, MATTER_ARRAY_SIZE(kLeaveEndpoints2)));
+        auto result    = tester.Invoke(Commands::LeaveGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::Success);
@@ -513,40 +837,214 @@ TEST_F(TestGroupcastCluster, TestLeaveGroup)
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
 
-        size_t memershipCount = 0;
-        ASSERT_EQ(CountListElements(memberships, memershipCount), CHIP_NO_ERROR);
-        ASSERT_EQ(memershipCount, 2u); // Group1 [1..255], Group1 [256..300], Group2 [1..40]
+        // Build expected endpoint arrays
+        // Group1: all endpoints except kLeaveEndpoints1 and kLeaveEndpoints2 (100 - 8 - 8 = 84 endpoints)
+        EndpointId group1_endpoints[kTotalEndpoints - MATTER_ARRAY_SIZE(kLeaveEndpoints1) - MATTER_ARRAY_SIZE(kLeaveEndpoints2)];
+        for (size_t i = 0, j = 0; (i < kTotalEndpoints) && (j < MATTER_ARRAY_SIZE(group1_endpoints)); i++)
+        {
+            EndpointId ep = static_cast<EndpointId>(i + 1);
+            if (kRemoveSet1.find(ep) == kRemoveSet1.end() && kRemoveSet2.find(ep) == kRemoveSet2.end())
+            {
+                group1_endpoints[j++] = ep;
+            }
+        }
 
-        GroupId group_id = kGroup1;
-        auto iter        = memberships.begin();
-        while (iter.Next())
+        // Group2: all endpoints except kLeaveEndpoints2 (100 - 8 = 92 endpoints)
+        EndpointId group2_endpoints[kTotalEndpoints - MATTER_ARRAY_SIZE(kLeaveEndpoints2)];
+        for (size_t i = 0, j = 0; (i < kTotalEndpoints) && (j < MATTER_ARRAY_SIZE(group2_endpoints)); i++)
         {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, group_id);
-            // Check the endpoints are still in the group
-            size_t found          = 0;
-            size_t endpoint_count = 0;
-            // Check endpoint count
-            size_t expected_count = (kGroup1 == group_id) ? kTotalEndpoints - kRemoveSet1.size() - kRemoveSet2.size()
-                                                          : kTotalEndpoints - kRemoveSet2.size();
-
-            ASSERT_TRUE(item.endpoints.HasValue());
-            ASSERT_EQ(item.endpoints.Value().ComputeSize(&endpoint_count), CHIP_NO_ERROR);
-            ASSERT_EQ(endpoint_count, expected_count);
-            // Check endpoints are stil in the group
-            auto iter2 = item.endpoints.Value().begin();
-            while (iter2.Next())
+            EndpointId ep = static_cast<EndpointId>(i + 1);
+            if (kRemoveSet2.find(ep) == kRemoveSet2.end())
             {
-                if (kRemoveSet2.find(iter2.GetValue()) != kRemoveSet2.end())
-                {
-                    found++;
-                }
+                group2_endpoints[j++] = ep;
             }
-            // Endpoints removed from both all groups
-            ASSERT_EQ(found, static_cast<size_t>(0));
-            group_id++;
         }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID   = kGroup1,
+                .endpoints = MakeOptional(DataModel::List<const EndpointId>(group1_endpoints, MATTER_ARRAY_SIZE(group1_endpoints))),
+                .keySetID  = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID   = kGroup2,
+                .endpoints = MakeOptional(DataModel::List<const EndpointId>(group2_endpoints, MATTER_ARRAY_SIZE(group2_endpoints))),
+                .keySetID  = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(false),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+
+    // LeaveGroup all groups completely.
+    {
+        Commands::LeaveGroup::Type data;
+        data.groupID = 0;
+        auto result  = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+    }
+
+    // Read Membership
+    {
+        app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
+        ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
+
+        // After leaving all groups, membership should be empty
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[0] = {};
+        ValidateMembership(memberships, expectedMembership, 0);
     }
+
+    // JoinGroup for GroupID 1 and then GroupID 2 with the same endpoint list.
+    {
+        // JoinGroup for GroupID 1
+        Commands::JoinGroup::Type data;
+        data.groupID         = kGroup1;
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints);
+        data.keySetID        = kKeyset;
+        data.useAuxiliaryACL = MakeOptional(true);
+        auto result          = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+        // JoinGroup for GroupID 2
+        data.groupID = kGroup2;
+        result       = tester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        // Read Membership
+        app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
+        ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup2,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+
+    // LeaveGroup for GroupID 2 without providing any endpoints
+    {
+        Commands::LeaveGroup::Type data;
+        data.groupID = kGroup2;
+        data.endpoints.ClearValue();
+        auto result = tester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        // Read Membership
+        Attributes::Membership::TypeInfo::DecodableType memberships;
+        ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = { {
+            .groupID         = kGroup1,
+            .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints)),
+            .keySetID        = kKeyset,
+            .hasAuxiliaryACL = MakeOptional(true),
+            .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+        } };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+
+    // Create a Listener and Sender capable group with 1 endpoint.
+    // Remove the endpoint from the group. Verify that the group still exists for Sender.
+    app::Clusters::GroupcastCluster ListenerAndSender{ { mFabricHelper.GetFabricTable(), mProvider, mMockTimerDelegate },
+                                                       BitFlags<Feature>{ Feature::kListener, Feature::kSender } };
+    ASSERT_EQ(ListenerAndSender.Startup(*clusterContext), CHIP_NO_ERROR);
+    chip::Testing::ClusterTester listenerAndSendertester(ListenerAndSender);
+    listenerAndSendertester.SetFabricIndex(kTestFabricIndex);
+    {
+        // JoinGroup for GroupID 3
+        Commands::JoinGroup::Type data;
+        data.groupID         = kGroup3;
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints[0], 1);
+        data.keySetID        = kKeyset;
+        data.useAuxiliaryACL = MakeOptional(true);
+        auto result          = listenerAndSendertester.Invoke(Commands::JoinGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        // Read Membership
+        app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
+        ASSERT_EQ(listenerAndSendertester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup3,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], 1)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+
+    {
+        // LeaveGroup for GroupID 3
+        Commands::LeaveGroup::Type data;
+        data.groupID   = kGroup3;
+        data.endpoints = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], 1));
+        auto result    = listenerAndSendertester.Invoke(Commands::LeaveGroup::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
+        ASSERT_EQ(listenerAndSendertester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints[0], kMaxEndpoints)),
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID   = kGroup3,
+                .endpoints = MakeOptional(
+                    DataModel::List<const chip::EndpointId>()), // Listener is supported, so an empty endpoints list is expected.
+                .keySetID        = kKeyset,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+    ListenerAndSender.Shutdown(app::ClusterShutdownType::kClusterShutdown);
 }
 
 TEST_F(TestGroupcastCluster, TestUpdateGroupKey)
@@ -554,8 +1052,11 @@ TEST_F(TestGroupcastCluster, TestUpdateGroupKey)
     const uint8_t key1[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
     const uint8_t key2[] = { 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf };
     const EndpointId kEndpoints[] = { 1 };
+    GroupId kGroup1               = 0xab01;
+    GroupId kGroup2               = 0xcd02;
     const KeysetId kKeyset1       = 0xabcd;
     const KeysetId kKeyset2       = 0xcafe;
+    const KeysetId kKeyset3       = 0xface;
 
     chip::Testing::ClusterTester tester(mListener);
     tester.SetFabricIndex(kTestFabricIndex);
@@ -563,18 +1064,18 @@ TEST_F(TestGroupcastCluster, TestUpdateGroupKey)
     // Join groups
     {
         Commands::JoinGroup::Type data;
-        data.groupID         = 1;
+        data.groupID         = kGroup1;
         data.keySetID        = kKeyset1;
         data.key             = MakeOptional(ByteSpan(key1));
         data.useAuxiliaryACL = MakeOptional(true);
-        data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
 
         auto result = tester.Invoke(Commands::JoinGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::Success);
 
-        data.groupID  = 2;
+        data.groupID  = kGroup2;
         data.keySetID = kKeyset2;
         data.key      = MakeOptional(ByteSpan(key2));
         result        = tester.Invoke(Commands::JoinGroup::Id, data);
@@ -587,16 +1088,24 @@ TEST_F(TestGroupcastCluster, TestUpdateGroupKey)
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
-        GroupId group_id = 1;
-        auto iter        = memberships.begin();
-        while (iter.Next())
-        {
-            auto item            = iter.GetValue();
-            KeysetId expected_id = (1 == item.groupID) ? kKeyset1 : kKeyset2;
-            ASSERT_EQ(item.groupID, group_id);
-            ASSERT_EQ(item.keySetID, expected_id);
-            group_id++;
-        }
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+                .keySetID        = kKeyset1,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup2,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+                .keySetID        = kKeyset2,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 
     // Update
@@ -604,37 +1113,69 @@ TEST_F(TestGroupcastCluster, TestUpdateGroupKey)
         Commands::UpdateGroupKey::Type data;
 
         // Update existing key (invalid)
-        data.groupID  = 2;
+        data.groupID  = kGroup2;
         data.keySetID = kKeyset1;
         data.key      = MakeOptional(ByteSpan(key1));
-
-        auto result = tester.Invoke(Commands::UpdateGroupKey::Id, data);
+        auto result   = tester.Invoke(Commands::UpdateGroupKey::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::AlreadyExists);
 
-        // Update existing keyset (valid)
+        // Update to non-existing keyset (invalid)
+        data.groupID  = kGroup2;
+        data.keySetID = kKeyset3;
+        data.key.ClearValue();
+        result = tester.Invoke(Commands::UpdateGroupKey::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::NotFound);
+
+        // Update without key (always valid)
+        data.groupID  = kGroup2;
         data.keySetID = kKeyset1;
         data.key.ClearValue();
         result = tester.Invoke(Commands::UpdateGroupKey::Id, data);
         ASSERT_TRUE(result.status.has_value());
         EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
                   Protocols::InteractionModel::Status::Success);
+
+        // Create a new key (valid, if i <= mProvider.GetMaxGroupKeysPerFabric())
+        // 2 keysets already in use
+        data.key = MakeOptional(ByteSpan(key1));
+        for (uint16_t i = 3; i <= mProvider.GetMaxGroupKeysPerFabric() + 1; ++i)
+        {
+            data.keySetID = kKeyset2 + i;
+            result        = tester.Invoke(Commands::UpdateGroupKey::Id, data);
+            ASSERT_TRUE(result.status.has_value());
+            EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                      i > mProvider.GetMaxGroupKeysPerFabric() ? Protocols::InteractionModel::Status::ResourceExhausted
+                                                               : Protocols::InteractionModel::Status::Success);
+        }
     }
 
     // Read Membership
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
-        GroupId group_id = 1;
-        auto iter        = memberships.begin();
-        while (iter.Next())
-        {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, group_id);
-            ASSERT_EQ(item.keySetID, kKeyset1);
-            group_id++;
-        }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = {
+            {
+                .groupID         = kGroup1,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+                .keySetID        = kKeyset1,
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            },
+            {
+                .groupID         = kGroup2,
+                .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+                .keySetID        = static_cast<KeysetId>(kKeyset2 + mProvider.GetMaxGroupKeysPerFabric()),
+                .hasAuxiliaryACL = MakeOptional(true),
+                .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+            }
+        };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 }
 
@@ -655,7 +1196,7 @@ TEST_F(TestGroupcastCluster, TestConfigureAuxiliaryACL)
         data.keySetID        = kKeyset;
         data.key             = MakeOptional(ByteSpan(key));
         data.useAuxiliaryACL = MakeOptional(false);
-        data.endpoints       = chip::app::DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
+        data.endpoints       = DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints));
 
         auto result = tester.Invoke(Commands::JoinGroup::Id, data);
         ASSERT_TRUE(result.status.has_value());
@@ -667,15 +1208,31 @@ TEST_F(TestGroupcastCluster, TestConfigureAuxiliaryACL)
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
-        auto iter = memberships.begin();
-        while (iter.Next())
-        {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, kGroupId);
-            ASSERT_EQ(item.keySetID, kKeyset);
-            ASSERT_TRUE(item.hasAuxiliaryACL.HasValue());
-            ASSERT_FALSE(item.hasAuxiliaryACL.Value());
-        }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = { {
+            .groupID         = kGroupId,
+            .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+            .keySetID        = kKeyset,
+            .hasAuxiliaryACL = MakeOptional(false),
+            .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+        } };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
+    }
+
+    // Update Sender (false to true), invalid
+    {
+        chip::Testing::ClusterTester sender_tester(mSender);
+        sender_tester.SetFabricIndex(kTestFabricIndex);
+
+        Commands::ConfigureAuxiliaryACL::Type data;
+        data.groupID         = kGroupId;
+        data.useAuxiliaryACL = true;
+
+        auto result = sender_tester.Invoke(Commands::ConfigureAuxiliaryACL::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::ConstraintError);
     }
 
     // Update (false to true)
@@ -694,15 +1251,16 @@ TEST_F(TestGroupcastCluster, TestConfigureAuxiliaryACL)
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
-        auto iter = memberships.begin();
-        while (iter.Next())
-        {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, kGroupId);
-            ASSERT_EQ(item.keySetID, kKeyset);
-            ASSERT_TRUE(item.hasAuxiliaryACL.HasValue());
-            ASSERT_TRUE(item.hasAuxiliaryACL.Value());
-        }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = { {
+            .groupID         = kGroupId,
+            .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+            .keySetID        = kKeyset,
+            .hasAuxiliaryACL = MakeOptional(true),
+            .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+        } };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 
     // Update (true to false)
@@ -721,16 +1279,113 @@ TEST_F(TestGroupcastCluster, TestConfigureAuxiliaryACL)
     {
         app::Clusters::Groupcast::Attributes::Membership::TypeInfo::DecodableType memberships;
         ASSERT_EQ(tester.ReadAttribute(Attributes::Membership::Id, memberships), CHIP_NO_ERROR);
-        auto iter = memberships.begin();
-        while (iter.Next())
-        {
-            auto item = iter.GetValue();
-            ASSERT_EQ(item.groupID, kGroupId);
-            ASSERT_EQ(item.keySetID, kKeyset);
-            ASSERT_TRUE(item.hasAuxiliaryACL.HasValue());
-            ASSERT_FALSE(item.hasAuxiliaryACL.Value());
-        }
+
+        Clusters::Groupcast::Structs::MembershipStruct::Type expectedMembership[] = { {
+            .groupID         = kGroupId,
+            .endpoints       = MakeOptional(DataModel::List<const EndpointId>(kEndpoints, MATTER_ARRAY_SIZE(kEndpoints))),
+            .keySetID        = kKeyset,
+            .hasAuxiliaryACL = MakeOptional(false),
+            .mcastAddrPolicy = app::Clusters::Groupcast::MulticastAddrPolicyEnum::kIanaAddr,
+        } };
+
+        ValidateMembership(memberships, expectedMembership, MATTER_ARRAY_SIZE(expectedMembership));
     }
 }
 
+TEST_F(TestGroupcastCluster, TestGroupcastTestingCommand)
+{
+    ClusterTester tester(mListener);
+    tester.SetFabricIndex(kTestFabricIndex);
+
+    // Default should be "no fabric under test"
+    FabricIndex fabricUnderTest = kUndefinedFabricIndex;
+    ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+    EXPECT_EQ(fabricUnderTest, kUndefinedFabricIndex);
+
+    // Test invalid duration
+    {
+        Commands::GroupcastTesting::Type data;
+        data.testOperation = GroupcastTestingEnum::kEnableListenerTesting;
+        // Too small
+        data.durationSeconds = MakeOptional(static_cast<uint16_t>(9));
+
+        auto result = tester.Invoke(Commands::GroupcastTesting::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::ConstraintError);
+
+        // Command failed; should not have changed.
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kUndefinedFabricIndex);
+
+        // Too large
+        data.durationSeconds = MakeOptional(static_cast<uint16_t>(1201));
+        result               = tester.Invoke(Commands::GroupcastTesting::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::ConstraintError);
+
+        // Command failed; should not have changed from enabled state.
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kUndefinedFabricIndex);
+    }
+
+    // Enable testing (no duration)
+    {
+        Commands::GroupcastTesting::Type data;
+        data.testOperation = GroupcastTestingEnum::kEnableListenerTesting;
+
+        auto result = tester.Invoke(Commands::GroupcastTesting::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kTestFabricIndex);
+    }
+
+    // Disable testing should clear the fabric under test
+    {
+        Commands::GroupcastTesting::Type data;
+        data.testOperation = GroupcastTestingEnum::kDisableTesting;
+
+        auto result = tester.Invoke(Commands::GroupcastTesting::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kUndefinedFabricIndex);
+    }
+
+    // Enable Listener Testing with duration
+    {
+        const uint16_t durationSeconds = 10;
+
+        Commands::GroupcastTesting::Type data;
+        data.testOperation   = GroupcastTestingEnum::kEnableListenerTesting;
+        data.durationSeconds = MakeOptional(durationSeconds);
+
+        auto result = tester.Invoke(Commands::GroupcastTesting::Id, data);
+        ASSERT_TRUE(result.status.has_value());
+        EXPECT_EQ(result.status.value().GetStatusCode().GetStatus(), // NOLINT(bugprone-unchecked-optional-access)
+                  Protocols::InteractionModel::Status::Success);
+
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kTestFabricIndex);
+
+        //  Testing should still be active
+        mMockTimerDelegate.AdvanceClock(System::Clock::Seconds16(durationSeconds - 1));
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kTestFabricIndex);
+
+        //  Testing should end after the duration
+        mMockTimerDelegate.AdvanceClock(System::Clock::Seconds16(durationSeconds + 1));
+        ASSERT_EQ(tester.ReadAttribute(Attributes::FabricUnderTest::Id, fabricUnderTest), CHIP_NO_ERROR);
+        EXPECT_EQ(fabricUnderTest, kUndefinedFabricIndex);
+    }
+
+    // Enable Sender Testing with duration
+}
+
 } // namespace
diff --git a/src/app/clusters/groups-server/app_config_dependent_sources.cmake b/src/app/clusters/groups-server/app_config_dependent_sources.cmake
index d3c6f2f8d6b..89f6c9ce7cd 100644
--- a/src/app/clusters/groups-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/groups-server/app_config_dependent_sources.cmake
@@ -17,6 +17,5 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
-    "${CLUSTER_DIR}/GroupsCluster.cpp"
-    "${CLUSTER_DIR}/GroupsCluster.h"
 )
+
diff --git a/src/app/clusters/identify-server/app_config_dependent_sources.cmake b/src/app/clusters/identify-server/app_config_dependent_sources.cmake
index 19ea7ca25da..2ef6987c896 100644
--- a/src/app/clusters/identify-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/identify-server/app_config_dependent_sources.cmake
@@ -22,10 +22,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/identify-server.h"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/IdentifyCluster.cpp"
-    "${CLUSTER_DIR}/IdentifyCluster.h"
-)
\ No newline at end of file
diff --git a/src/app/clusters/illuminance-measurement-server/CodegenIntegration.cpp b/src/app/clusters/illuminance-measurement-server/CodegenIntegration.cpp
index 028f13e9ecb..372c8132ea5 100644
--- a/src/app/clusters/illuminance-measurement-server/CodegenIntegration.cpp
+++ b/src/app/clusters/illuminance-measurement-server/CodegenIntegration.cpp
@@ -47,11 +47,19 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
         IlluminanceMeasurementCluster::OptionalAttributeSet optionalAttributeSet(optionalAttributeBits);
         using namespace chip::Protocols::InteractionModel;
 
+        // Try to read the default value for these mandatory attributes but do not fail if the operation is not successful.
+        // This is because not all apps are setting a default value for them in ember.
         DataModel::Nullable<uint16_t> minMeasuredValue{};
-        VerifyOrDie(MinMeasuredValue::Get(endpointId, minMeasuredValue) == Status::Success);
+        if (MinMeasuredValue::Get(endpointId, minMeasuredValue) != Status::Success)
+        {
+            minMeasuredValue.SetNull();
+        }
 
         DataModel::Nullable<uint16_t> maxMeasuredValue{};
-        VerifyOrDie(MaxMeasuredValue::Get(endpointId, maxMeasuredValue) == Status::Success);
+        if (MaxMeasuredValue::Get(endpointId, maxMeasuredValue) != Status::Success)
+        {
+            maxMeasuredValue.SetNull();
+        }
 
         uint16_t tolerance{};
         if (optionalAttributeSet.IsSet(Tolerance::Id))
@@ -134,4 +142,21 @@ IlluminanceMeasurementCluster * FindClusterOnEndpoint(EndpointId endpointId)
     return static_cast<IlluminanceMeasurementCluster *>(illuminanceMeasurement);
 }
 
+CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<uint16_t> measuredValue)
+{
+    auto illuminanceMeasurement = FindClusterOnEndpoint(endpointId);
+    VerifyOrReturnError(illuminanceMeasurement != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    return illuminanceMeasurement->SetMeasuredValue(measuredValue);
+}
+
+CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<uint16_t> minMeasuredValue,
+                                 DataModel::Nullable<uint16_t> maxMeasuredValue)
+{
+    auto illuminanceMeasurement = FindClusterOnEndpoint(endpointId);
+    VerifyOrReturnError(illuminanceMeasurement != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    return illuminanceMeasurement->SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue);
+}
+
 } // namespace chip::app::Clusters::IlluminanceMeasurement
diff --git a/src/app/clusters/illuminance-measurement-server/CodegenIntegration.h b/src/app/clusters/illuminance-measurement-server/CodegenIntegration.h
index 2d11fdaba75..bc6d0f7d5ff 100644
--- a/src/app/clusters/illuminance-measurement-server/CodegenIntegration.h
+++ b/src/app/clusters/illuminance-measurement-server/CodegenIntegration.h
@@ -24,4 +24,8 @@ namespace chip::app::Clusters::IlluminanceMeasurement {
 
 IlluminanceMeasurementCluster * FindClusterOnEndpoint(EndpointId endpointId);
 
+CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<uint16_t> measuredValue);
+CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<uint16_t> minMeasuredValue,
+                                 DataModel::Nullable<uint16_t> maxMeasuredValue);
+
 } // namespace chip::app::Clusters::IlluminanceMeasurement
diff --git a/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.cpp b/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.cpp
index c9c2dacd326..d0dd4c97aed 100644
--- a/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.cpp
+++ b/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.cpp
@@ -22,12 +22,37 @@ namespace chip::app::Clusters {
 
 using namespace IlluminanceMeasurement::Attributes;
 
+// According to the spec, absolute minimum value is 1
+constexpr uint16_t kMinMeasuredValueRange = 1;
+// According to the spec, maximum minimum value is 65533
+constexpr uint16_t kMaxMeasuredValueRange = 65533;
+// According to the spec, maximum tolerance value is 2048
+constexpr uint16_t kMaxTolerance = 2048;
+
 IlluminanceMeasurementCluster::IlluminanceMeasurementCluster(EndpointId endpointId,
                                                              const OptionalAttributeSet & optionalAttributeSet,
                                                              const StartupConfiguration & config) :
     DefaultServerCluster({ endpointId, IlluminanceMeasurement::Id }),
-    mOptionalAttributeSet(optionalAttributeSet), mConfig(config)
-{}
+    mOptionalAttributeSet(optionalAttributeSet)
+{
+    if (!config.minMeasuredValue.IsNull())
+    {
+        VerifyOrDie(config.minMeasuredValue.Value() >= kMinMeasuredValueRange &&
+                    config.minMeasuredValue.Value() <= kMaxMeasuredValueRange);
+
+        if (!config.maxMeasuredValue.IsNull())
+        {
+            VerifyOrDie(config.maxMeasuredValue.Value() >= config.minMeasuredValue.Value() + 1);
+        }
+    }
+
+    VerifyOrDie(!mOptionalAttributeSet.IsSet(Tolerance::Id) || config.tolerance <= kMaxTolerance);
+
+    mMinMeasuredValue = config.minMeasuredValue;
+    mMaxMeasuredValue = config.maxMeasuredValue;
+    mTolerance        = config.tolerance;
+    mLightSensorType  = config.lightSensorType;
+}
 
 DataModel::ActionReturnStatus IlluminanceMeasurementCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
                                                                            AttributeValueEncoder & encoder)
@@ -41,13 +66,13 @@ DataModel::ActionReturnStatus IlluminanceMeasurementCluster::ReadAttribute(const
     case MeasuredValue::Id:
         return encoder.Encode(mMeasuredValue);
     case MinMeasuredValue::Id:
-        return encoder.Encode(mConfig.minMeasuredValue);
+        return encoder.Encode(mMinMeasuredValue);
     case MaxMeasuredValue::Id:
-        return encoder.Encode(mConfig.maxMeasuredValue);
+        return encoder.Encode(mMaxMeasuredValue);
     case Tolerance::Id:
-        return encoder.Encode(mConfig.tolerance);
+        return encoder.Encode(mTolerance);
     case LightSensorType::Id:
-        return encoder.Encode(mConfig.lightSensorType);
+        return encoder.Encode(mLightSensorType);
     default:
         return Protocols::InteractionModel::Status::UnsupportedAttribute;
     }
@@ -70,14 +95,39 @@ CHIP_ERROR IlluminanceMeasurementCluster::SetMeasuredValue(DataModel::Nullable<u
 {
     if (measuredValue.ValueOr(0) != 0)
     {
-        // According to the spec, absolute minimum value is 1
-        VerifyOrReturnError(measuredValue.Value() >= mConfig.minMeasuredValue.ValueOr(1), CHIP_ERROR_INVALID_ARGUMENT);
+        if (!mMinMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(measuredValue.Value() >= mMinMeasuredValue.Value(), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
 
-        // According to the spec, absolute maximum value is 0xFFFE / 65534
-        VerifyOrReturnError(measuredValue.Value() <= mConfig.maxMeasuredValue.ValueOr(0xFFFE), CHIP_ERROR_INVALID_ARGUMENT);
+        if (!mMaxMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(measuredValue.Value() <= mMaxMeasuredValue.Value(), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
     }
+
     SetAttributeValue(mMeasuredValue, measuredValue, MeasuredValue::Id);
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR IlluminanceMeasurementCluster::SetMeasuredValueRange(DataModel::Nullable<uint16_t> minMeasuredValue,
+                                                                DataModel::Nullable<uint16_t> maxMeasuredValue)
+{
+    if (!minMeasuredValue.IsNull())
+    {
+        VerifyOrReturnError(minMeasuredValue.Value() >= kMinMeasuredValueRange &&
+                                minMeasuredValue.Value() <= kMaxMeasuredValueRange,
+                            CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+        if (!maxMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(maxMeasuredValue.Value() >= minMeasuredValue.Value() + 1, CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
+    }
+
+    SetAttributeValue(mMinMeasuredValue, minMeasuredValue, MinMeasuredValue::Id);
+    SetAttributeValue(mMaxMeasuredValue, maxMeasuredValue, MaxMeasuredValue::Id);
+    return CHIP_NO_ERROR;
+}
+
 } // namespace chip::app::Clusters
diff --git a/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.h b/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.h
index 0f79c937422..8237bb88a75 100644
--- a/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.h
+++ b/src/app/clusters/illuminance-measurement-server/IlluminanceMeasurementCluster.h
@@ -49,10 +49,18 @@ class IlluminanceMeasurementCluster : public DefaultServerCluster
     CHIP_ERROR SetMeasuredValue(DataModel::Nullable<uint16_t> measuredValue);
     DataModel::Nullable<uint16_t> GetMeasuredValue() const { return mMeasuredValue; }
 
+    CHIP_ERROR SetMeasuredValueRange(DataModel::Nullable<uint16_t> minMeasuredValue,
+                                     DataModel::Nullable<uint16_t> maxMeasuredValue);
+    DataModel::Nullable<uint16_t> GetMinMeasuredValue() const { return mMinMeasuredValue; }
+    DataModel::Nullable<uint16_t> GetMaxMeasuredValue() const { return mMaxMeasuredValue; }
+
 protected:
-    DataModel::Nullable<uint16_t> mMeasuredValue{};
     const OptionalAttributeSet mOptionalAttributeSet;
-    const StartupConfiguration mConfig;
+    DataModel::Nullable<uint16_t> mMeasuredValue{};
+    DataModel::Nullable<uint16_t> mMinMeasuredValue{};
+    DataModel::Nullable<uint16_t> mMaxMeasuredValue{};
+    uint16_t mTolerance{};
+    DataModel::Nullable<IlluminanceMeasurement::LightSensorTypeEnum> mLightSensorType{};
 };
 
 } // namespace chip::app::Clusters
diff --git a/src/app/clusters/illuminance-measurement-server/README.md b/src/app/clusters/illuminance-measurement-server/README.md
index 750b641fdf4..589aef9125e 100644
--- a/src/app/clusters/illuminance-measurement-server/README.md
+++ b/src/app/clusters/illuminance-measurement-server/README.md
@@ -1,25 +1,22 @@
-# This cluster is currently following a code driven approach.
+This cluster is currently following a code driven approach.
 
-# This means that the Accessors for the attribute MeasuredValue are no longer available.
+This means that the Accessors for the attribute MeasuredValue are no longer
+available.
 
-# Now to set the value for this attribute the following code change applies:
+Now to set the value for this attribute the following code change applies:
 
 # BEFORE (using the Accessors)
 
-    app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n));
+    app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::Set(1, static_cast<uint16_t>(1000));
 
 # CURRENT (using the code driven approach)
 
-    auto illuminanceMeasurement = app::Clusters::IlluminanceMeasurement::FindClusterOnEndpoint(1);
-    if (illuminanceMeasurement != nullptr)
+    CHIP_ERROR err = app::Clusters::IlluminanceMeasurement::SetMeasuredValue(1, static_cast<uint16_t>(1000));
+    if (err == CHIP_NO_ERROR)
     {
-        CHIP_ERROR err = illuminanceMeasurement->SetMeasuredValue(static_cast<int16_t>(n));
-        if (err == CHIP_NO_ERROR)
-        {
-            // SetMeasuredValue() succeeded
-        }
-        else
-        {
-            // SetMeasuredValue() failed
-        }
+        // SetMeasuredValue() succeeded
+    }
+    else
+    {
+        // SetMeasuredValue() failed
     }
diff --git a/src/app/clusters/illuminance-measurement-server/app_config_dependent_sources.cmake b/src/app/clusters/illuminance-measurement-server/app_config_dependent_sources.cmake
index e09c99e2410..f4882ca070e 100644
--- a/src/app/clusters/illuminance-measurement-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/illuminance-measurement-server/app_config_dependent_sources.cmake
@@ -18,11 +18,3 @@ TARGET_SOURCES(
    "${CLUSTER_DIR}/CodegenIntegration.cpp"
    "${CLUSTER_DIR}/CodegenIntegration.h"
 )
-
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/IlluminanceMeasurementCluster.cpp"
-    "${CLUSTER_DIR}/IlluminanceMeasurementCluster.h"
-)
diff --git a/src/app/clusters/illuminance-measurement-server/tests/TestIlluminanceMeasurementCluster.cpp b/src/app/clusters/illuminance-measurement-server/tests/TestIlluminanceMeasurementCluster.cpp
index 5efb0395f73..f67f47acc8b 100644
--- a/src/app/clusters/illuminance-measurement-server/tests/TestIlluminanceMeasurementCluster.cpp
+++ b/src/app/clusters/illuminance-measurement-server/tests/TestIlluminanceMeasurementCluster.cpp
@@ -139,43 +139,134 @@ TEST_F(TestIlluminanceMeasurementCluster, ReadAttributeTest)
 
 TEST_F(TestIlluminanceMeasurementCluster, MeasuredValue)
 {
-    {
-        IlluminanceMeasurementCluster cluster(kRootEndpointId, IlluminanceMeasurementCluster::OptionalAttributeSet(),
-                                              IlluminanceMeasurementCluster::StartupConfiguration{
-                                                  .minMeasuredValue = DataModel::Nullable<uint16_t>(1),
-                                                  .maxMeasuredValue = DataModel::Nullable<uint16_t>(3),
-                                              });
-        ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+    IlluminanceMeasurementCluster cluster(kRootEndpointId, IlluminanceMeasurementCluster::OptionalAttributeSet(),
+                                          IlluminanceMeasurementCluster::StartupConfiguration{
+                                              .minMeasuredValue = DataModel::Nullable<uint16_t>(1),
+                                              .maxMeasuredValue = DataModel::Nullable<uint16_t>(3),
+                                          });
+    ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
 
-        DataModel::Nullable<uint16_t> measuredValue{};
-        measuredValue.SetNonNull(0);
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
-        DataModel::Nullable<uint16_t> measuredVal = cluster.GetMeasuredValue();
-        EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+    DataModel::Nullable<uint16_t> measuredValue{};
+    measuredValue.SetNonNull(0);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    DataModel::Nullable<uint16_t> measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(1);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(2);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(3);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal, measuredValue);
 
-        measuredValue.SetNonNull(1);
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
-        measuredVal = cluster.GetMeasuredValue();
-        EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+    DataModel::Nullable<uint16_t> minMeasuredValue{};
+    DataModel::Nullable<uint16_t> maxMeasuredValue{};
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
 
-        measuredValue.SetNonNull(2);
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
-        measuredVal = cluster.GetMeasuredValue();
-        EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
 
-        measuredValue.SetNonNull(3);
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
-        measuredVal = cluster.GetMeasuredValue();
-        EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+    measuredValue.SetNonNull(65535);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
 
-        measuredValue.SetNonNull(4);
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_ERROR_INVALID_ARGUMENT);
+    minMeasuredValue.SetNonNull(2);
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
 
-        measuredValue.SetNull();
-        EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
-        measuredVal = cluster.GetMeasuredValue();
-        EXPECT_EQ(measuredVal, measuredValue);
+    measuredValue.SetNonNull(1);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue.Value()), CHIP_IM_GLOBAL_STATUS(ConstraintError));
 
-        cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
-    }
+    measuredValue.SetNonNull(65535);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNonNull(3);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNonNull(1);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+}
+
+TEST_F(TestIlluminanceMeasurementCluster, MeasuredValueRange)
+{
+    IlluminanceMeasurementCluster cluster(kRootEndpointId, IlluminanceMeasurementCluster::OptionalAttributeSet(),
+                                          IlluminanceMeasurementCluster::StartupConfiguration{});
+    ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+    DataModel::Nullable<uint16_t> minMeasuredValue{};
+    DataModel::Nullable<uint16_t> maxMeasuredValue{};
+    minMeasuredValue.SetNonNull(1);
+    maxMeasuredValue.SetNonNull(2);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    DataModel::Nullable<uint16_t> minMeasuredVal = cluster.GetMinMeasuredValue();
+    DataModel::Nullable<uint16_t> maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal.Value(), minMeasuredValue.Value());
+    EXPECT_EQ(maxMeasuredVal.Value(), maxMeasuredValue.Value());
+
+    minMeasuredValue.SetNonNull(65533);
+    maxMeasuredValue.SetNonNull(65534);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal.Value(), minMeasuredValue.Value());
+    EXPECT_EQ(maxMeasuredVal.Value(), maxMeasuredValue.Value());
+
+    minMeasuredValue.SetNonNull(0);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNonNull(65534);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNonNull(65533);
+    maxMeasuredValue.SetNonNull(65533);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    minMeasuredValue.SetNonNull(65533);
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNonNull(65533);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
 }
diff --git a/src/app/clusters/joint-fabric-administrator-server/joint-fabric-administrator-server.cpp b/src/app/clusters/joint-fabric-administrator-server/joint-fabric-administrator-server.cpp
index 65e7367a484..e2044fea533 100644
--- a/src/app/clusters/joint-fabric-administrator-server/joint-fabric-administrator-server.cpp
+++ b/src/app/clusters/joint-fabric-administrator-server/joint-fabric-administrator-server.cpp
@@ -22,6 +22,7 @@
 
 #include <access/AccessControl.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/AttributeAccessInterfaceRegistry.h>
@@ -74,6 +75,7 @@ class JointFabricAdministratorGlobalInstance : public AttributeAccessInterface,
     {}
 
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+    void OnFailSafeTimerExpired();
 
 private:
     CHIP_ERROR ReadAdministratorFabricIndex(AttributeValueEncoder & aEncoder);
@@ -90,6 +92,10 @@ class JointFabricAdministratorGlobalInstance : public AttributeAccessInterface,
 
     static void OnTrustVerificationCompletion(CHIP_ERROR err);
 
+    CHIP_ERROR VerifyAddICACStep1(const FabricIndex accessFabric, const Commands::AddICAC::DecodableType & commandData);
+    CHIP_ERROR VerifyAddICACPublicKey(const Commands::AddICAC::DecodableType & commandData);
+    CHIP_ERROR VerifyAddICACDNEncodingRules(const Commands::AddICAC::DecodableType & commandData);
+
     // Cleans up asynchronous resources used in HandleAnnounceJointFabricAdministrator
     void CleanupAnnounceJFA();
 
@@ -99,6 +105,18 @@ class JointFabricAdministratorGlobalInstance : public AttributeAccessInterface,
 
 JointFabricAdministratorGlobalInstance gJointFabricAdministratorGlobalInstance;
 
+namespace {
+void OnPlatformEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
+{
+    if (event->Type == DeviceLayer::DeviceEventType::kFailSafeTimerExpired)
+    {
+        auto * instance = reinterpret_cast<JointFabricAdministratorGlobalInstance *>(arg);
+        VerifyOrReturn(instance != nullptr);
+        instance->OnFailSafeTimerExpired();
+    }
+}
+} // anonymous namespace
+
 CHIP_ERROR JointFabricAdministratorGlobalInstance::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
     VerifyOrDie(aPath.mClusterId == JointFabricAdministratorCluster::Id);
@@ -167,6 +185,7 @@ void JointFabricAdministratorGlobalInstance::HandleOJCW(HandlerContext & ctx,
     Optional<StatusCodeEnum> status = Optional<StatusCodeEnum>::Missing();
     Status globalStatus             = Status::Success;
     Spake2pVerifier verifier;
+    DataModel::Nullable<FabricIndex> administratorFabricIndex;
 
     ChipLogProgress(Zcl, "Received command to open joint commissioning window");
 
@@ -176,22 +195,28 @@ void JointFabricAdministratorGlobalInstance::HandleOJCW(HandlerContext & ctx,
     auto & commissionMgr          = Server::GetInstance().GetCommissioningWindowManager();
 
     VerifyOrExit(fabricInfo != nullptr, status.Emplace(StatusCodeEnum::kPAKEParameterError));
+    VerifyOrExit(Attributes::AdministratorFabricIndex::Get(ctx.mRequestPath.mEndpointId, administratorFabricIndex) ==
+                     Status::Success,
+                 globalStatus = Status::Failure);
+    VerifyOrExit(!administratorFabricIndex.IsNull() && administratorFabricIndex.Value() != 0,
+                 status.Emplace(StatusCodeEnum::kInvalidAdministratorFabricIndex));
     VerifyOrExit(failSafeContext.IsFailSafeFullyDisarmed(), status.Emplace(StatusCodeEnum::kBusy));
 
     VerifyOrExit(!commissionMgr.IsCommissioningWindowOpen(), status.Emplace(StatusCodeEnum::kBusy));
-    VerifyOrExit(iterations >= kSpake2p_Min_PBKDF_Iterations, status.Emplace(StatusCodeEnum::kPAKEParameterError));
-    VerifyOrExit(iterations <= kSpake2p_Max_PBKDF_Iterations, status.Emplace(StatusCodeEnum::kPAKEParameterError));
-    VerifyOrExit(salt.size() >= kSpake2p_Min_PBKDF_Salt_Length, status.Emplace(StatusCodeEnum::kPAKEParameterError));
-    VerifyOrExit(salt.size() <= kSpake2p_Max_PBKDF_Salt_Length, status.Emplace(StatusCodeEnum::kPAKEParameterError));
+    VerifyOrExit(iterations >= kSpake2p_Min_PBKDF_Iterations, globalStatus = Status::InvalidCommand);
+    VerifyOrExit(iterations <= kSpake2p_Max_PBKDF_Iterations, globalStatus = Status::InvalidCommand);
+    VerifyOrExit(salt.size() >= kSpake2p_Min_PBKDF_Salt_Length, globalStatus = Status::InvalidCommand);
+    VerifyOrExit(salt.size() <= kSpake2p_Max_PBKDF_Salt_Length, globalStatus = Status::InvalidCommand);
 
     VerifyOrExit(commissioningTimeout <= commissionMgr.MaxCommissioningTimeout(), globalStatus = Status::InvalidCommand);
     VerifyOrExit(commissioningTimeout >= commissionMgr.MinCommissioningTimeout(), globalStatus = Status::InvalidCommand);
     VerifyOrExit(discriminator <= kMaxDiscriminatorValue, globalStatus = Status::InvalidCommand);
 
-    VerifyOrExit(verifier.Deserialize(pakeVerifier) == CHIP_NO_ERROR, status.Emplace(StatusCodeEnum::kPAKEParameterError));
+    VerifyOrExit(pakeVerifier.size() == kSpake2p_VerifierSerialized_Length, globalStatus = Status::InvalidCommand);
+    VerifyOrExit(verifier.Deserialize(pakeVerifier) == CHIP_NO_ERROR, globalStatus = Status::InvalidCommand);
     VerifyOrExit(commissionMgr.OpenJointCommissioningWindow(commissioningTimeout, discriminator, verifier, iterations, salt,
                                                             fabricIndex, fabricInfo->GetVendorId()) == CHIP_NO_ERROR,
-                 status.Emplace(StatusCodeEnum::kPAKEParameterError));
+                 globalStatus = Status::InvalidCommand);
     ChipLogProgress(Zcl, "Commissioning window is now open");
 
 exit:
@@ -219,14 +244,19 @@ void JointFabricAdministratorGlobalInstance::HandleAnnounceJointFabricAdministra
 
     std::optional<Status> globalStatus = std::nullopt;
     ConcreteCommandPath cachedPath(ctx.mRequestPath.mEndpointId, ctx.mRequestPath.mClusterId, ctx.mRequestPath.mCommandId);
+    const FabricIndex accessingFabricIndex = ctx.mCommandHandler.GetAccessingFabricIndex();
+
+    // Ensure that the accessing fabric is not marked as verified before we proceed
+    Server::GetInstance().GetJointFabricAdministrator().ClearVidVerificationForFabric();
 
-    auto onComplete = [this, cachedPath](const CHIP_ERROR & err) {
+    auto onComplete = [this, cachedPath, accessingFabricIndex](const CHIP_ERROR & err) {
         if (mActiveCommandHandle.has_value())
         {
             auto * commandHandler = mActiveCommandHandle.value().Get();
             if (err == CHIP_NO_ERROR)
             {
                 ChipLogProgress(JointFabric, "Successfully verified trust against commissioning fabric administrator");
+                Server::GetInstance().GetJointFabricAdministrator().SetVidVerificationForFabric(accessingFabricIndex);
                 commandHandler->AddStatus(cachedPath, Status::Success);
             }
             else
@@ -236,8 +266,6 @@ void JointFabricAdministratorGlobalInstance::HandleAnnounceJointFabricAdministra
             }
         }
 
-        // TODO: Potential edge case: if TrustVerification is interrupted such that this callback isn't invoked,
-        // CleanupAnnounceJFA wouldn't run and HandleAnnounceJointFabricAdministrator will permanently return Status::Busy.
         CleanupAnnounceJFA();
     };
 
@@ -267,6 +295,13 @@ void JointFabricAdministratorGlobalInstance::CleanupAnnounceJFA()
     mActiveCommandHandle.reset();
 }
 
+void JointFabricAdministratorGlobalInstance::OnFailSafeTimerExpired()
+{
+    CleanupAnnounceJFA();
+    Server::GetInstance().GetJointFabricAdministrator().ClearVidVerificationForFabric();
+    Server::GetInstance().GetJointFabricAdministrator().SetPeerJFAdminClusterEndpointId(kInvalidEndpointId);
+}
+
 void JointFabricAdministratorGlobalInstance::HandleICACCSRRequest(HandlerContext & ctx,
                                                                   const Commands::ICACCSRRequest::DecodableType & commandData)
 {
@@ -274,12 +309,14 @@ void JointFabricAdministratorGlobalInstance::HandleICACCSRRequest(HandlerContext
     ChipLogProgress(Zcl, "JointFabricAdministrator: Received an ICACCSRRequest command");
 
     auto nonDefaultStatus           = Status::Success;
+    Optional<StatusCodeEnum> status = Optional<StatusCodeEnum>::Missing();
     auto & failSafeContext          = Server::GetInstance().GetFailSafeContext();
     auto & jointFabricAdministrator = Server::GetInstance().GetJointFabricAdministrator();
 
     uint8_t buf[Credentials::kMaxDERCertLength];
     MutableByteSpan icacCsr(buf, Credentials::kMaxDERCertLength);
     Commands::ICACCSRResponse::Type response;
+    DataModel::Nullable<FabricIndex> administratorFabricIndex;
 
     // command must be invoked over CASE
     VerifyOrExit(ctx.mCommandHandler.GetSubjectDescriptor().authMode == Access::AuthMode::kCase,
@@ -288,12 +325,16 @@ void JointFabricAdministratorGlobalInstance::HandleICACCSRRequest(HandlerContext
     VerifyOrExit(failSafeContext.IsFailSafeArmed(ctx.mCommandHandler.GetAccessingFabricIndex()),
                  nonDefaultStatus = Status::FailsafeRequired);
 
-    /* TODO spec.: If the <<ref_FabricTableVendorIdVerificationProcedure, FabricFabric Table Vendor ID Verification Procedure>>
-     * has not been executed against the initiator of this command, the command SHALL fail
-     * with a <<ref_JFVidNotVerified, JfVidNotVerified>> status code SHALL be sent back to the initiator.*/
-
     VerifyOrExit(!failSafeContext.AddICACCommandHasBeenInvoked(), nonDefaultStatus = Status::ConstraintError);
 
+    VerifyOrExit(jointFabricAdministrator.WasVidVerificationExecutedForFabric(ctx.mCommandHandler.GetAccessingFabricIndex()),
+                 status.Emplace(StatusCodeEnum::kVIDNotVerified));
+
+    VerifyOrExit(Attributes::AdministratorFabricIndex::Get(ctx.mRequestPath.mEndpointId, administratorFabricIndex) ==
+                     Status::Success,
+                 nonDefaultStatus = Status::Failure);
+    VerifyOrExit(!administratorFabricIndex.IsNull(), status.Emplace(StatusCodeEnum::kInvalidAdministratorFabricIndex));
+
     VerifyOrExit(jointFabricAdministrator.GetDelegate() != nullptr, nonDefaultStatus = Status::Failure);
     VerifyOrExit(jointFabricAdministrator.GetDelegate()->GetIcacCsr(icacCsr) == CHIP_NO_ERROR, nonDefaultStatus = Status::Failure);
 
@@ -301,7 +342,11 @@ void JointFabricAdministratorGlobalInstance::HandleICACCSRRequest(HandlerContext
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
 
 exit:
-    if (nonDefaultStatus != Status::Success)
+    if (status.HasValue())
+    {
+        TEMPORARY_RETURN_IGNORED ctx.mCommandHandler.AddClusterSpecificFailure(ctx.mRequestPath, to_underlying(status.Value()));
+    }
+    else if (nonDefaultStatus != Status::Success)
     {
         ctx.mCommandHandler.AddStatus(ctx.mRequestPath, nonDefaultStatus);
     }
@@ -313,9 +358,9 @@ void JointFabricAdministratorGlobalInstance::HandleAddICAC(HandlerContext & ctx,
     MATTER_TRACE_SCOPE("AddICAC", "JointFabricAdministrator");
     ChipLogProgress(Zcl, "JointFabricAdministrator: Received an AddICAC command");
 
-    auto nonDefaultStatus  = Status::Success;
-    auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
-
+    auto nonDefaultStatus                   = Status::Success;
+    auto & failSafeContext                  = Server::GetInstance().GetFailSafeContext();
+    Optional<ICACResponseStatusEnum> status = Optional<ICACResponseStatusEnum>::Missing();
     // command must be invoked over CASE
     VerifyOrExit(ctx.mCommandHandler.GetSubjectDescriptor().authMode == Access::AuthMode::kCase,
                  nonDefaultStatus = Status::InvalidCommand);
@@ -326,12 +371,70 @@ void JointFabricAdministratorGlobalInstance::HandleAddICAC(HandlerContext & ctx,
     VerifyOrExit(!failSafeContext.AddICACCommandHasBeenInvoked(), nonDefaultStatus = Status::ConstraintError);
     failSafeContext.SetAddICACHasBeenInvoked();
 
-    /* TODO: implement rest of the AddICAC checks */
+    VerifyOrExit(VerifyAddICACStep1(ctx.mCommandHandler.GetAccessingFabricIndex(), commandData) == CHIP_NO_ERROR,
+                 status.Emplace(ICACResponseStatusEnum::kInvalidICAC));
+
+    VerifyOrExit(VerifyAddICACPublicKey(commandData) == CHIP_NO_ERROR, status.Emplace(ICACResponseStatusEnum::kInvalidPublicKey));
+
+    VerifyOrExit(VerifyAddICACDNEncodingRules(commandData) == CHIP_NO_ERROR, status.Emplace(ICACResponseStatusEnum::kInvalidICAC));
 
 exit:
+    if (status.HasValue())
+    {
+        Commands::ICACResponse::Type response;
+        response.statusCode = status.Value();
+        ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
+        return;
+    }
     ctx.mCommandHandler.AddStatus(ctx.mRequestPath, nonDefaultStatus);
 }
 
+CHIP_ERROR JointFabricAdministratorGlobalInstance::VerifyAddICACStep1(const FabricIndex accessFabric,
+                                                                      const Commands::AddICAC::DecodableType & commandData)
+{
+    constexpr uint8_t kMaxCertsInChain = 2;
+    uint8_t rcacBuf[Credentials::kMaxCHIPCertLength];
+    MutableByteSpan rcacSpan{ rcacBuf };
+    ChipCertificateSet certificates;
+    ValidationContext validContext;
+
+    ReturnErrorOnFailure(Server::GetInstance().GetFabricTable().FetchRootCert(accessFabric, rcacSpan));
+    ReturnErrorOnFailure(certificates.Init(kMaxCertsInChain));
+    ReturnErrorOnFailure(certificates.LoadCert(rcacSpan, BitFlags<CertDecodeFlags>(CertDecodeFlags::kIsTrustAnchor)));
+    ReturnErrorOnFailure(
+        certificates.LoadCert(commandData.ICACValue, BitFlags<CertDecodeFlags>(CertDecodeFlags::kGenerateTBSHash)));
+    validContext.Reset();
+    validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kKeyCertSign);
+    validContext.mRequiredCertType = CertType::kICA;
+    return certificates.ValidateCert(certificates.GetLastCert(), validContext);
+}
+
+CHIP_ERROR JointFabricAdministratorGlobalInstance::VerifyAddICACPublicKey(const Commands::AddICAC::DecodableType & commandData)
+{
+    uint8_t csrBuf[Credentials::kMaxDERCertLength];
+    MutableByteSpan icacCsr{ csrBuf };
+    Crypto::P256PublicKey csrPubKey;
+    Credentials::P256PublicKeySpan icacPubKeySpan;
+
+    auto & jointFabricAdministrator = Server::GetInstance().GetJointFabricAdministrator();
+    VerifyOrReturnError(jointFabricAdministrator.GetDelegate() != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    ReturnErrorOnFailure(jointFabricAdministrator.GetDelegate()->GetIcacCsr(icacCsr));
+    ReturnErrorOnFailure(Crypto::VerifyCertificateSigningRequest(icacCsr.data(), icacCsr.size(), csrPubKey));
+    ReturnErrorOnFailure(Credentials::ExtractPublicKeyFromChipCert(commandData.ICACValue, icacPubKeySpan));
+
+    Credentials::P256PublicKeySpan csrPubKeySpan(csrPubKey.ConstBytes());
+    VerifyOrReturnError(memcmp(icacPubKeySpan.data(), csrPubKeySpan.data(), icacPubKeySpan.size()) == 0,
+                        CHIP_ERROR_INVALID_ARGUMENT);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+JointFabricAdministratorGlobalInstance::VerifyAddICACDNEncodingRules(const Commands::AddICAC::DecodableType & commandData)
+{
+    Credentials::ChipCertificateData certData;
+    return Credentials::DecodeChipCert(commandData.ICACValue, certData);
+}
+
 void JointFabricAdministratorGlobalInstance::HandleTransferAnchorRequest(
     HandlerContext & ctx, const Commands::TransferAnchorRequest::DecodableType & commandData)
 {
@@ -374,10 +477,13 @@ void MatterJointFabricAdministratorPluginServerInitCallback()
     ChipLogProgress(DataManagement, "JointFabricAdministrator: initializing");
     AttributeAccessInterfaceRegistry::Instance().Register(&gJointFabricAdministratorGlobalInstance);
     ReturnOnFailure(CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&gJointFabricAdministratorGlobalInstance));
+    ReturnOnFailure(DeviceLayer::PlatformMgr().AddEventHandler(
+        OnPlatformEventHandler, reinterpret_cast<intptr_t>(&gJointFabricAdministratorGlobalInstance)));
 }
 
 void MatterJointFabricAdministratorPluginServerShutdownCallback()
 {
+    DeviceLayer::PlatformMgr().RemoveEventHandler(OnPlatformEventHandler);
     AttributeAccessInterfaceRegistry::Instance().Unregister(&gJointFabricAdministratorGlobalInstance);
     ReturnOnFailure(CommandHandlerInterfaceRegistry::Instance().UnregisterCommandHandler(&gJointFabricAdministratorGlobalInstance));
 }
diff --git a/src/app/clusters/joint-fabric-datastore-server/joint-fabric-datastore-server.cpp b/src/app/clusters/joint-fabric-datastore-server/joint-fabric-datastore-server.cpp
index 48cef537ec0..178b35fd8af 100644
--- a/src/app/clusters/joint-fabric-datastore-server/joint-fabric-datastore-server.cpp
+++ b/src/app/clusters/joint-fabric-datastore-server/joint-fabric-datastore-server.cpp
@@ -294,11 +294,10 @@ bool emberAfJointFabricDatastoreClusterAddKeySetCallback(
     CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
     const JointFabricDatastoreCluster::Commands::AddKeySet::DecodableType & commandData)
 {
-    CHIP_ERROR err                                                                              = CHIP_NO_ERROR;
-    JointFabricDatastoreCluster::Structs::DatastoreGroupKeySetStruct::DecodableType groupKeySet = commandData.groupKeySet;
+    CHIP_ERROR err                                   = CHIP_NO_ERROR;
     app::JointFabricDatastore & jointFabricDatastore = Server::GetInstance().GetJointFabricDatastore();
 
-    SuccessOrExit(err = jointFabricDatastore.AddGroupKeySetEntry(groupKeySet));
+    SuccessOrExit(err = jointFabricDatastore.AddGroupKeySetEntry(commandData.groupKeySet));
 
 exit:
     if (err == CHIP_NO_ERROR)
diff --git a/src/app/clusters/level-control/app_config_dependent_sources.cmake b/src/app/clusters/level-control/app_config_dependent_sources.cmake
index 5e3cf39ba10..3d67542ffc5 100644
--- a/src/app/clusters/level-control/app_config_dependent_sources.cmake
+++ b/src/app/clusters/level-control/app_config_dependent_sources.cmake
@@ -18,4 +18,4 @@ TARGET_SOURCES(
   PRIVATE
     "${CLUSTER_DIR}/codegen/level-control.cpp"
     "${CLUSTER_DIR}/codegen/level-control.h"
-)
\ No newline at end of file
+)
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 b7d0a0b116d..7eeec6f11c3 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.cpp
+++ b/src/app/clusters/mode-base-server/mode-base-server.cpp
@@ -22,12 +22,15 @@
 #include <app/InteractionModelEngine.h>
 #include <app/SafeAttributePersistenceProvider.h>
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/clusters/on-off-server/on-off-server.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <tracing/macros.h>
 
+#ifdef MATTER_DM_PLUGIN_ON_OFF_SERVER
+#include <app/clusters/on-off-server/on-off-server.h>
+#endif // MATTER_DM_PLUGIN_ON_OFF_SERVER
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/src/app/clusters/network-commissioning/app_config_dependent_sources.cmake b/src/app/clusters/network-commissioning/app_config_dependent_sources.cmake
index 2b722f64cae..b80f9d9e11f 100644
--- a/src/app/clusters/network-commissioning/app_config_dependent_sources.cmake
+++ b/src/app/clusters/network-commissioning/app_config_dependent_sources.cmake
@@ -20,15 +20,3 @@ TARGET_SOURCES(
   "${CLUSTER_DIR}/CodegenInstance.h"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-  "${CLUSTER_DIR}/constants.h"
-  "${CLUSTER_DIR}/NetworkCommissioningCluster.cpp"
-  "${CLUSTER_DIR}/NetworkCommissioningCluster.h"
-  "${CLUSTER_DIR}/ThreadScanResponse.cpp"
-  "${CLUSTER_DIR}/ThreadScanResponse.h"
-  "${CLUSTER_DIR}/WifiScanResponse.cpp"
-  "${CLUSTER_DIR}/WifiScanResponse.h"
-)
diff --git a/src/app/clusters/occupancy-sensor-server/CodegenIntegration.cpp b/src/app/clusters/occupancy-sensor-server/CodegenIntegration.cpp
index 1b74bf7b75f..d52e6fd4d97 100644
--- a/src/app/clusters/occupancy-sensor-server/CodegenIntegration.cpp
+++ b/src/app/clusters/occupancy-sensor-server/CodegenIntegration.cpp
@@ -50,7 +50,10 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
                                                    uint32_t optionalAttributeBits, uint32_t featureMap) override
     {
         OccupancySensingCluster::Config config(endpointId);
-        config.WithFeatures(BitFlags<Feature>(featureMap));
+
+        // No features enabled (defaults to PIR). If the app needs other features, it MUST instantiate and configure the cluster
+        // directly instead of relying on CodegenIntegration.
+        config.WithFeatures(BitFlags<Feature>(0u));
 
         // If the optional HoldTime attribute is enabled, enable the HoldTime logic.
         // The delay attributes are required if the corresponding sensor feature is present.
@@ -96,7 +99,7 @@ void MatterOccupancySensingClusterInitCallback(EndpointId endpointId)
             .clusterId                 = OccupancySensing::Id,
             .fixedClusterInstanceCount = kOccupancySensingFixedClusterCount,
             .maxClusterInstanceCount   = kOccupancySensingMaxClusterCount,
-            .fetchFeatureMap           = true,
+            .fetchFeatureMap           = false,
             .fetchOptionalAttributes   = true,
         },
         integrationDelegate);
diff --git a/src/app/clusters/occupancy-sensor-server/README.md b/src/app/clusters/occupancy-sensor-server/README.md
index 1ad40b1d4e6..321de83c354 100644
--- a/src/app/clusters/occupancy-sensor-server/README.md
+++ b/src/app/clusters/occupancy-sensor-server/README.md
@@ -121,9 +121,9 @@ void MySensorHardwareCallback(bool isOccupied)
 }
 ```
 
-## Legacy Usage (Not Recommended)
+## Compatibility with ZAP/Codegen
 
-For backwards compatibility with applications that rely on older ZAP-generated
+For backwards compatibility with applications that rely on ZAP-generated
 patterns (like the `all-clusters-app`), a compatibility layer is provided in
 `CodegenIntegration.h` and `CodegenIntegration.cpp`.
 
@@ -157,13 +157,43 @@ void MySensorHardwareCallback(bool isOccupied)
 }
 ```
 
-Unlike the legacy implementation, the current implementation handles all timer
-related functionality related to the `holdTime` attribute. So the application
-should no longer maintain any `holdTime` timer.
+## Migration from SDK versions < 1.6
 
-The global attribute setter/getters are no longer available. This is now
+### Timer Handling
+
+The cluster implementation now handles all timer related functionality related
+to the `holdTime` attribute. Applications must not maintain any `holdTime`
+timer.
+
+### Attribute Access
+
+The global attribute setter/getters are no longer available. Attribute access is
 exclusively done using the public methods from the `OccupancySensingCluster`
 class.
 
-Post attribute change callback are now exclusively handled by implementing an
+### Callbacks
+
+Post attribute change callbacks are exclusively handled by implementing an
 `OccupancySensingDelegate`.
+
+### Feature Map Configuration
+
+The Feature map is hardcoded to 0 (defaults to PIR) when relying on
+`CodegenIntegration.cpp` (ZAP) for backward compatibility. If your application
+needs to enable other features, it MUST instantiate and configure the cluster
+directly. The deprecated API assumed there was only a single instance of
+Occupancy Sensor and allowed the application to configure the feature map with:
+
+```
+OccupancySensing::Instance(Feature::kPassiveInfrared);
+```
+
+This must be done using `config.WithFeatures(featureMap)` as shown in section
+[Instantiate Delegates and Cluster](#2-instantiate-delegates-and-cluster)
+through the constructor for each instance of the cluster:
+
+```
+auto config = Clusters::OccupancySensingCluster::Config(kYourEndpointId)
+
+RegisteredServerCluster<Clusters::OccupancySensingCluster> myOccupancyCluster(config.WithFeatures(Feature::kPassiveInfrared));
+```
diff --git a/src/app/clusters/occupancy-sensor-server/app_config_dependent_sources.cmake b/src/app/clusters/occupancy-sensor-server/app_config_dependent_sources.cmake
index d2b2d6dabd0..bef9bd2e08e 100644
--- a/src/app/clusters/occupancy-sensor-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/occupancy-sensor-server/app_config_dependent_sources.cmake
@@ -20,10 +20,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/OccupancySensingCluster.cpp"
-    "${CLUSTER_DIR}/OccupancySensingCluster.h"
-)
\ No newline at end of file
diff --git a/src/app/clusters/on-off-server/app_config_dependent_sources.cmake b/src/app/clusters/on-off-server/app_config_dependent_sources.cmake
index ab49b26ba26..96f02ffa283 100644
--- a/src/app/clusters/on-off-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/on-off-server/app_config_dependent_sources.cmake
@@ -22,9 +22,14 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/codegen/mode-base-integration.h"
     "${CLUSTER_DIR}/codegen/mode-select-integration.cpp"
     "${CLUSTER_DIR}/codegen/mode-select-integration.h"
+    "${CLUSTER_DIR}/codegen/scenes-integration.cpp"
+    "${CLUSTER_DIR}/codegen/scenes-integration.h"
     "${CLUSTER_DIR}/codegen/on-off-server.cpp"
     "${CLUSTER_DIR}/codegen/on-off-server.h"
+)
+
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
     "${CLUSTER_DIR}/on-off-server.h"
-    "${CLUSTER_DIR}/codegen/scenes-integration.cpp"
-    "${CLUSTER_DIR}/codegen/scenes-integration.h"
 )
diff --git a/src/app/clusters/operational-credentials-server/CodegenIntegration.cpp b/src/app/clusters/operational-credentials-server/CodegenIntegration.cpp
index 5b867246fef..cd38e03cfcf 100644
--- a/src/app/clusters/operational-credentials-server/CodegenIntegration.cpp
+++ b/src/app/clusters/operational-credentials-server/CodegenIntegration.cpp
@@ -24,6 +24,7 @@
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <credentials/GroupDataProvider.h>
 
 using namespace chip;
 using namespace chip::app;
@@ -43,12 +44,18 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
     ServerClusterRegistration & CreateRegistration(EndpointId endpointId, unsigned emberEndpointIndex,
                                                    uint32_t optionalAttributeBits, uint32_t featureMap) override
     {
-        OperationalCredentialsCluster::Context context = { .fabricTable     = Server::GetInstance().GetFabricTable(),
-                                                           .failSafeContext = Server::GetInstance().GetFailSafeContext(),
-                                                           .sessionManager  = Server::GetInstance().GetSecureSessionManager(),
-                                                           .dnssdServer     = app::DnssdServer::Instance(),
-                                                           .commissioningWindowManager =
-                                                               Server::GetInstance().GetCommissioningWindowManager() };
+        OperationalCredentialsCluster::Context context = {
+            .fabricTable                = Server::GetInstance().GetFabricTable(),
+            .failSafeContext            = Server::GetInstance().GetFailSafeContext(),
+            .sessionManager             = Server::GetInstance().GetSecureSessionManager(),
+            .dnssdServer                = app::DnssdServer::Instance(),
+            .commissioningWindowManager = Server::GetInstance().GetCommissioningWindowManager(),
+            .dacProvider                = *Credentials::GetDeviceAttestationCredentialsProvider(),
+            .groupDataProvider          = *Credentials::GetGroupDataProvider(),
+            .accessControl              = Server::GetInstance().GetAccessControl(),
+            .platformManager            = DeviceLayer::PlatformMgr(),
+            .eventManagement            = EventManagement::GetInstance(),
+        };
         gServer.Create(endpointId, context);
         return gServer.Registration();
     }
diff --git a/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp b/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp
index 1f61c165481..1019e576e2d 100644
--- a/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp
+++ b/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp
@@ -68,7 +68,8 @@ const FabricInfo * RetrieveCurrentFabric(CommandHandler * aCommandHandler, Fabri
 }
 
 CHIP_ERROR CreateAccessControlEntryForNewFabricAdministrator(const Access::SubjectDescriptor & subjectDescriptor,
-                                                             FabricIndex fabricIndex, uint64_t subject)
+                                                             FabricIndex fabricIndex, uint64_t subject,
+                                                             Access::AccessControl & accessControl)
 {
     NodeId subjectAsNodeID = static_cast<NodeId>(subject);
 
@@ -78,12 +79,12 @@ CHIP_ERROR CreateAccessControlEntryForNewFabricAdministrator(const Access::Subje
     }
 
     Access::AccessControl::Entry entry;
-    ReturnErrorOnFailure(Access::GetAccessControl().PrepareEntry(entry));
+    ReturnErrorOnFailure(accessControl.PrepareEntry(entry));
     ReturnErrorOnFailure(entry.SetFabricIndex(fabricIndex));
     ReturnErrorOnFailure(entry.SetPrivilege(Access::Privilege::kAdminister));
     ReturnErrorOnFailure(entry.SetAuthMode(Access::AuthMode::kCase));
     ReturnErrorOnFailure(entry.AddSubject(nullptr, subject));
-    CHIP_ERROR err = Access::GetAccessControl().CreateEntry(&subjectDescriptor, fabricIndex, nullptr, entry);
+    CHIP_ERROR err = accessControl.CreateEntry(&subjectDescriptor, fabricIndex, nullptr, entry);
 
     if (err != CHIP_NO_ERROR)
     {
@@ -274,7 +275,7 @@ CHIP_ERROR ReadRootCertificates(AttributeValueEncoder & aEncoder, FabricTable &
 std::optional<DataModel::ActionReturnStatus> HandleCSRRequest(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                                               TLV::TLVReader & input_arguments, FabricTable & fabricTable,
                                                               FailSafeContext & failSafeContext,
-                                                              Credentials::DeviceAttestationCredentialsProvider * dacProvider)
+                                                              Credentials::DeviceAttestationCredentialsProvider & dacProvider)
 {
     MATTER_TRACE_SCOPE("CSRRequest", "OperationalCredentials");
     Commands::CSRRequest::DecodableType commandData;
@@ -373,7 +374,7 @@ std::optional<DataModel::ActionReturnStatus> HandleCSRRequest(CommandHandler * c
             MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
 
             // Generate attestation signature
-            err = dacProvider->SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
+            err = dacProvider.SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
             Crypto::ClearSecretData(nocsrElements.Get() + nocsrElementsSpan.size(), attestationChallenge.size());
             VerifyOrExit(err == CHIP_NO_ERROR, errorStatus = Status::Failure);
             VerifyOrExit(signatureSpan.size() == Crypto::P256ECDSASignature::Capacity(), errorStatus = Status::Failure);
@@ -399,20 +400,20 @@ std::optional<DataModel::ActionReturnStatus> HandleAddNOC(CommandHandler * comma
                                                           TLV::TLVReader & input_arguments, FabricTable & fabricTable,
                                                           FailSafeContext & failSafeContext, DnssdServer & dnssdServer,
                                                           CommissioningWindowManager & commissioningWindowManager,
-                                                          bool & reportChange)
+                                                          Credentials::GroupDataProvider & groupDataProvider,
+                                                          Access::AccessControl & accessControl, bool & reportChange)
 {
     MATTER_TRACE_SCOPE("AddNOC", "OperationalCredentials");
     Commands::AddNOC::DecodableType commandData;
     ReturnErrorOnFailure(commandData.Decode(input_arguments));
 
-    auto & NOCValue          = commandData.NOCValue;
-    auto & ICACValue         = commandData.ICACValue;
-    auto & adminVendorId     = commandData.adminVendorId;
-    auto & ipkValue          = commandData.IPKValue;
-    auto * groupDataProvider = Credentials::GetGroupDataProvider();
-    auto nocResponse         = NodeOperationalCertStatusEnum::kOk;
-    auto errorStatus         = Status::Success;
-    bool needRevert          = false;
+    auto & NOCValue      = commandData.NOCValue;
+    auto & ICACValue     = commandData.ICACValue;
+    auto & adminVendorId = commandData.adminVendorId;
+    auto & ipkValue      = commandData.IPKValue;
+    auto nocResponse     = NodeOperationalCertStatusEnum::kOk;
+    auto errorStatus     = Status::Success;
+    bool needRevert      = false;
 
     CHIP_ERROR err             = CHIP_NO_ERROR;
     FabricIndex newFabricIndex = kUndefinedFabricIndex;
@@ -443,9 +444,6 @@ std::optional<DataModel::ActionReturnStatus> HandleAddNOC(CommandHandler * comma
     VerifyOrExit(hasPendingKey, nocResponse = NodeOperationalCertStatusEnum::kMissingCsr);
     VerifyOrExit(!csrWasForUpdateNoc, errorStatus = Status::ConstraintError);
 
-    // Internal error that would prevent IPK from being added
-    VerifyOrExit(groupDataProvider != nullptr, errorStatus = Status::Failure);
-
     // We can't possibly have a matching root based on the fact that we don't have
     // a shared root store. Therefore we would later fail path validation due to
     // missing root. Let's early-bail with InvalidNOC.
@@ -494,7 +492,7 @@ std::optional<DataModel::ActionReturnStatus> HandleAddNOC(CommandHandler * comma
     err = newFabricInfo->GetCompressedFabricIdBytes(compressed_fabric_id);
     VerifyOrExit(err == CHIP_NO_ERROR, errorStatus = Status::Failure);
 
-    err = groupDataProvider->SetKeySet(newFabricIndex, compressed_fabric_id, keyset);
+    err = groupDataProvider.SetKeySet(newFabricIndex, compressed_fabric_id, keyset);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
 
     /**
@@ -518,7 +516,7 @@ std::optional<DataModel::ActionReturnStatus> HandleAddNOC(CommandHandler * comma
     // Creating the initial ACL must occur after the PASE session has adopted the fabric index
     // (see above) so that the concomitant event, which is fabric scoped, is properly handled.
     err = CreateAccessControlEntryForNewFabricAdministrator(commandObj->GetSubjectDescriptor(), newFabricIndex,
-                                                            commandData.caseAdminSubject);
+                                                            commandData.caseAdminSubject, accessControl);
     VerifyOrExit(err != CHIP_ERROR_INTERNAL, errorStatus = Status::Failure);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
 
@@ -548,12 +546,8 @@ std::optional<DataModel::ActionReturnStatus> HandleAddNOC(CommandHandler * comma
 
         // Revert IPK and ACL entries added, ignoring errors, since some steps may have been skipped
         // and error handling does not assist.
-        if (groupDataProvider != nullptr)
-        {
-            (void) groupDataProvider->RemoveFabric(newFabricIndex);
-        }
-
-        (void) Access::GetAccessControl().DeleteAllEntriesForFabric(newFabricIndex);
+        (void) groupDataProvider.RemoveFabric(newFabricIndex);
+        (void) accessControl.DeleteAllEntriesForFabric(newFabricIndex);
 
         reportChange = true;
     }
@@ -914,7 +908,7 @@ std::optional<DataModel::ActionReturnStatus> HandleSignVIDVerificationRequest(Co
 
 std::optional<DataModel::ActionReturnStatus>
 HandleCertificateChainRequest(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
-                              TLV::TLVReader & input_arguments, Credentials::DeviceAttestationCredentialsProvider * dacProvider)
+                              TLV::TLVReader & input_arguments, Credentials::DeviceAttestationCredentialsProvider & dacProvider)
 {
     MATTER_TRACE_SCOPE("CertificateChainRequest", "OperationalCredentials");
     Commands::CertificateChainRequest::DecodableType commandData;
@@ -932,12 +926,12 @@ HandleCertificateChainRequest(CommandHandler * commandObj, const ConcreteCommand
     if (certificateType == kDACCertificate)
     {
         ChipLogProgress(Zcl, "OpCreds: Certificate Chain request received for DAC");
-        SuccessOrExit(err = dacProvider->GetDeviceAttestationCert(derBufSpan));
+        SuccessOrExit(err = dacProvider.GetDeviceAttestationCert(derBufSpan));
     }
     else if (certificateType == kPAICertificate)
     {
         ChipLogProgress(Zcl, "OpCreds: Certificate Chain request received for PAI");
-        SuccessOrExit(err = dacProvider->GetProductAttestationIntermediateCert(derBufSpan));
+        SuccessOrExit(err = dacProvider.GetProductAttestationIntermediateCert(derBufSpan));
     }
     else
     {
@@ -956,7 +950,7 @@ HandleCertificateChainRequest(CommandHandler * commandObj, const ConcreteCommand
 
 std::optional<DataModel::ActionReturnStatus>
 HandleAttestationRequest(CommandHandler * commandObj, const ConcreteCommandPath & commandPath, TLV::TLVReader & input_arguments,
-                         Credentials::DeviceAttestationCredentialsProvider * dacProvider)
+                         Credentials::DeviceAttestationCredentialsProvider & dacProvider)
 {
     MATTER_TRACE_SCOPE("AttestationRequest", "OperationalCredentials");
     OperationalCredentials::Commands::AttestationRequest::DecodableType commandData;
@@ -987,13 +981,7 @@ HandleAttestationRequest(CommandHandler * commandObj, const ConcreteCommandPath
 
     VerifyOrExit(attestationNonce.size() == Credentials::kExpectedAttestationNonceSize, errorStatus = Status::InvalidCommand);
 
-    if (dacProvider == nullptr)
-    {
-        err = CHIP_ERROR_INTERNAL;
-        VerifyOrExit(dacProvider != nullptr, errorStatus = Status::Failure);
-    }
-
-    err = dacProvider->GetCertificationDeclaration(certDeclSpan);
+    err = dacProvider.GetCertificationDeclaration(certDeclSpan);
     VerifyOrExit(err == CHIP_NO_ERROR, errorStatus = Status::Failure);
 
     attestationElementsLen = TLV::EstimateStructOverhead(certDeclSpan.size(), attestationNonce.size(), sizeof(uint64_t) * 8);
@@ -1018,7 +1006,7 @@ HandleAttestationRequest(CommandHandler * commandObj, const ConcreteCommandPath
         MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
 
         // Generate attestation signature
-        err = dacProvider->SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
+        err = dacProvider.SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
         Crypto::ClearSecretData(attestationElements.Get() + attestationElementsSpan.size(), attestationChallenge.size());
         VerifyOrExit(err == CHIP_NO_ERROR, errorStatus = Status::Failure);
         VerifyOrExit(signatureSpan.size() == Crypto::P256ECDSASignature::Capacity(), errorStatus = Status::Failure);
@@ -1083,17 +1071,17 @@ void OperationalCredentialsCluster::FailSafeCleanup(const DeviceLayer::ChipDevic
     // Session Context at the Server.
     if (nocAddedOrUpdatedDuringFailsafe)
     {
-        cluster->GetSessionManager().ExpireAllSessionsForFabric(fabricIndex);
+        cluster->mOpCredsContext.sessionManager.ExpireAllSessionsForFabric(fabricIndex);
     }
 
-    cluster->GetFabricTable().RevertPendingFabricData();
+    cluster->mOpCredsContext.fabricTable.RevertPendingFabricData();
 
     // If an AddNOC command had been successfully invoked, achieve the equivalent effect of invoking the RemoveFabric command
     // against the Fabric Index stored in the Fail-Safe Context for the Fabric Index that was the subject of the AddNOC
     // command.
     if (nocAddedDuringFailsafe)
     {
-        CHIP_ERROR err = cluster->GetFabricTable().Delete(fabricIndex);
+        CHIP_ERROR err = cluster->mOpCredsContext.fabricTable.Delete(fabricIndex);
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(Zcl, "OpCreds: failed to delete fabric at index %u: %" CHIP_ERROR_FORMAT, fabricIndex, err.Format());
@@ -1104,7 +1092,7 @@ void OperationalCredentialsCluster::FailSafeCleanup(const DeviceLayer::ChipDevic
     {
         // Operational identities/records available may have changed due to NodeID update. Need to refresh all records.
         // The case of fabric removal that reverts AddNOC is handled by the `DeleteFabricFromTable` flow above.
-        cluster->GetDNSSDServer().StartServer();
+        cluster->mOpCredsContext.dnssdServer.StartServer();
     }
 }
 
@@ -1112,12 +1100,12 @@ CHIP_ERROR OperationalCredentialsCluster::Startup(ServerClusterContext & context
 {
     ReturnErrorOnFailure(DefaultServerCluster::Startup(context));
     ReturnErrorOnFailure(mOpCredsContext.fabricTable.AddFabricDelegate(this));
-    return DeviceLayer::PlatformMgrImpl().AddEventHandler(OnPlatformEventHandler, reinterpret_cast<intptr_t>(this));
+    return mOpCredsContext.platformManager.AddEventHandler(OnPlatformEventHandler, reinterpret_cast<intptr_t>(this));
 }
 
 void OperationalCredentialsCluster::Shutdown(ClusterShutdownType shutdownType)
 {
-    DeviceLayer::PlatformMgrImpl().RemoveEventHandler(OnPlatformEventHandler);
+    mOpCredsContext.platformManager.RemoveEventHandler(OnPlatformEventHandler);
     mOpCredsContext.fabricTable.RemoveFabricDelegate(this);
     DefaultServerCluster::Shutdown(shutdownType);
 }
@@ -1191,16 +1179,18 @@ std::optional<DataModel::ActionReturnStatus> OperationalCredentialsCluster::Invo
     switch (request.path.mCommandId)
     {
     case OperationalCredentials::Commands::AttestationRequest::Id:
-        return HandleAttestationRequest(handler, request.path, input_arguments, GetDACProvider());
+        return HandleAttestationRequest(handler, request.path, input_arguments, mOpCredsContext.dacProvider);
     case OperationalCredentials::Commands::CertificateChainRequest::Id:
-        return HandleCertificateChainRequest(handler, request.path, input_arguments, GetDACProvider());
+        return HandleCertificateChainRequest(handler, request.path, input_arguments, mOpCredsContext.dacProvider);
     case OperationalCredentials::Commands::CSRRequest::Id:
-        return HandleCSRRequest(handler, request.path, input_arguments, GetFabricTable(), GetFailSafeContext(), GetDACProvider());
+        return HandleCSRRequest(handler, request.path, input_arguments, mOpCredsContext.fabricTable,
+                                mOpCredsContext.failSafeContext, mOpCredsContext.dacProvider);
     case OperationalCredentials::Commands::AddNOC::Id: {
         bool reportChange = false;
         std::optional<DataModel::ActionReturnStatus> returnStatus =
-            HandleAddNOC(handler, request.path, input_arguments, GetFabricTable(), GetFailSafeContext(), GetDNSSDServer(),
-                         GetCommissioningWindowManager(), reportChange);
+            HandleAddNOC(handler, request.path, input_arguments, mOpCredsContext.fabricTable, mOpCredsContext.failSafeContext,
+                         mOpCredsContext.dnssdServer, mOpCredsContext.commissioningWindowManager, mOpCredsContext.groupDataProvider,
+                         mOpCredsContext.accessControl, reportChange);
         if (reportChange)
         {
             // Notify the attributes containing fabric metadata can be read with new data
@@ -1211,10 +1201,11 @@ std::optional<DataModel::ActionReturnStatus> OperationalCredentialsCluster::Invo
         return returnStatus;
     }
     case OperationalCredentials::Commands::UpdateNOC::Id:
-        return HandleUpdateNOC(handler, input_arguments, request, GetFabricTable(), GetFailSafeContext(), GetDNSSDServer());
+        return HandleUpdateNOC(handler, input_arguments, request, mOpCredsContext.fabricTable, mOpCredsContext.failSafeContext,
+                               mOpCredsContext.dnssdServer);
     case OperationalCredentials::Commands::UpdateFabricLabel::Id: {
         std::optional<DataModel::ActionReturnStatus> returnStatus =
-            HandleUpdateFabricLabel(handler, input_arguments, request, GetFabricTable());
+            HandleUpdateFabricLabel(handler, input_arguments, request, mOpCredsContext.fabricTable);
         if (!returnStatus.has_value())
         {
             // Succeeded at updating the label, mark Fabrics table changed.
@@ -1223,13 +1214,14 @@ std::optional<DataModel::ActionReturnStatus> OperationalCredentialsCluster::Invo
         return returnStatus;
     }
     case OperationalCredentials::Commands::RemoveFabric::Id:
-        return HandleRemoveFabric(handler, request.path, input_arguments, GetFabricTable());
+        return HandleRemoveFabric(handler, request.path, input_arguments, mOpCredsContext.fabricTable);
     case OperationalCredentials::Commands::AddTrustedRootCertificate::Id:
-        return HandleAddTrustedRootCertificate(handler, request.path, input_arguments, GetFabricTable(), GetFailSafeContext());
+        return HandleAddTrustedRootCertificate(handler, request.path, input_arguments, mOpCredsContext.fabricTable,
+                                               mOpCredsContext.failSafeContext);
     case OperationalCredentials::Commands::SetVIDVerificationStatement::Id: {
         bool reportChange                                         = false;
         std::optional<DataModel::ActionReturnStatus> returnStatus = HandleSetVIDVerificationStatement(
-            handler, input_arguments, request, GetFabricTable(), GetFailSafeContext(), reportChange);
+            handler, input_arguments, request, mOpCredsContext.fabricTable, mOpCredsContext.failSafeContext, reportChange);
         if (reportChange)
         {
             // Handle dirty-marking if anything changed. Only `Fabrics` attribute is reported since `NOCs`
@@ -1241,7 +1233,7 @@ std::optional<DataModel::ActionReturnStatus> OperationalCredentialsCluster::Invo
         return returnStatus;
     }
     case OperationalCredentials::Commands::SignVIDVerificationRequest::Id:
-        return HandleSignVIDVerificationRequest(handler, request.path, input_arguments, GetFabricTable());
+        return HandleSignVIDVerificationRequest(handler, request.path, input_arguments, mOpCredsContext.fabricTable);
     default:
         return Protocols::InteractionModel::Status::UnsupportedCommand;
     }
@@ -1273,9 +1265,9 @@ void OperationalCredentialsCluster::OnFabricRemoved(const FabricTable & fabricTa
 
     // We need to withdraw the advertisement for the now-removed fabric, so need
     // to restart advertising altogether.
-    GetDNSSDServer().StartServer();
+    mOpCredsContext.dnssdServer.StartServer();
 
-    TEMPORARY_RETURN_IGNORED EventManagement::GetInstance().FabricRemoved(fabricIndex);
+    TEMPORARY_RETURN_IGNORED mOpCredsContext.eventManagement.FabricRemoved(fabricIndex);
 
     NotifyAttributeChanged(OperationalCredentials::Attributes::CommissionedFabrics::Id);
     NotifyAttributeChanged(OperationalCredentials::Attributes::Fabrics::Id);
@@ -1287,37 +1279,6 @@ void OperationalCredentialsCluster::OnFabricUpdated(const FabricTable & fabricTa
     NotifyAttributeChanged(OperationalCredentials::Attributes::Fabrics::Id);
 }
 
-FabricTable & OperationalCredentialsCluster::GetFabricTable()
-{
-    return mOpCredsContext.fabricTable;
-}
-
-FailSafeContext & OperationalCredentialsCluster::GetFailSafeContext()
-{
-    return mOpCredsContext.failSafeContext;
-}
-
-Credentials::DeviceAttestationCredentialsProvider * OperationalCredentialsCluster::GetDACProvider()
-{
-    // TODO: This dependency should be removed after fixing #41122 so we don't depend on external singletons,
-    return Credentials::GetDeviceAttestationCredentialsProvider();
-}
-
-SessionManager & OperationalCredentialsCluster::GetSessionManager()
-{
-    return mOpCredsContext.sessionManager;
-}
-
-DnssdServer & OperationalCredentialsCluster::GetDNSSDServer()
-{
-    return mOpCredsContext.dnssdServer;
-}
-
-CommissioningWindowManager & OperationalCredentialsCluster::GetCommissioningWindowManager()
-{
-    return mOpCredsContext.commissioningWindowManager;
-}
-
 void OperationalCredentialsCluster::OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex)
 {
     const FabricInfo * fabric = fabricTable.FindFabricWithIndex(fabricIndex);
diff --git a/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.h b/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.h
index 672d1ae89c9..e5bbbb8cdb0 100644
--- a/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.h
+++ b/src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.h
@@ -16,12 +16,15 @@
  */
 #pragma once
 
+#include <access/AccessControl.h>
+#include <app/EventManagement.h>
 #include <app/FailSafeContext.h>
 #include <app/server-cluster/DefaultServerCluster.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Dnssd.h>
 #include <clusters/OperationalCredentials/ClusterId.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/GroupDataProvider.h>
 
 namespace chip {
 namespace app {
@@ -37,6 +40,11 @@ class OperationalCredentialsCluster : public DefaultServerCluster, chip::FabricT
         SessionManager & sessionManager;
         DnssdServer & dnssdServer;
         CommissioningWindowManager & commissioningWindowManager;
+        Credentials::DeviceAttestationCredentialsProvider & dacProvider;
+        Credentials::GroupDataProvider & groupDataProvider;
+        Access::AccessControl & accessControl;
+        DeviceLayer::PlatformManager & platformManager;
+        app::EventManagement & eventManagement;
     };
 
     OperationalCredentialsCluster(EndpointId endpoint, const Context context) :
@@ -66,13 +74,6 @@ class OperationalCredentialsCluster : public DefaultServerCluster, chip::FabricT
 
 private:
     const OperationalCredentialsCluster::Context mOpCredsContext;
-
-    FabricTable & GetFabricTable();
-    FailSafeContext & GetFailSafeContext();
-    Credentials::DeviceAttestationCredentialsProvider * GetDACProvider();
-    SessionManager & GetSessionManager();
-    DnssdServer & GetDNSSDServer();
-    CommissioningWindowManager & GetCommissioningWindowManager();
 };
 
 } // namespace Clusters
diff --git a/src/app/clusters/operational-credentials-server/app_config_dependent_sources.cmake b/src/app/clusters/operational-credentials-server/app_config_dependent_sources.cmake
index fbd7a3823c8..6981c76119a 100644
--- a/src/app/clusters/operational-credentials-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/operational-credentials-server/app_config_dependent_sources.cmake
@@ -19,10 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/OperationalCredentialsCluster.h"
-    "${CLUSTER_DIR}/OperationalCredentialsCluster.cpp"
-)
diff --git a/src/app/clusters/operational-credentials-server/tests/TestOperationalCredentials.cpp b/src/app/clusters/operational-credentials-server/tests/TestOperationalCredentials.cpp
index 505683882ee..99b0e004d8b 100644
--- a/src/app/clusters/operational-credentials-server/tests/TestOperationalCredentials.cpp
+++ b/src/app/clusters/operational-credentials-server/tests/TestOperationalCredentials.cpp
@@ -46,12 +46,18 @@ struct TestOperationalCredentials : public ::testing::Test
 
 TEST_F(TestOperationalCredentials, TestAttributes)
 {
-    OperationalCredentialsCluster::Context context = { .fabricTable     = Server::GetInstance().GetFabricTable(),
-                                                       .failSafeContext = Server::GetInstance().GetFailSafeContext(),
-                                                       .sessionManager  = Server::GetInstance().GetSecureSessionManager(),
-                                                       .dnssdServer     = app::DnssdServer::Instance(),
-                                                       .commissioningWindowManager =
-                                                           Server::GetInstance().GetCommissioningWindowManager() };
+    OperationalCredentialsCluster::Context context = {
+        .fabricTable                = Server::GetInstance().GetFabricTable(),
+        .failSafeContext            = Server::GetInstance().GetFailSafeContext(),
+        .sessionManager             = Server::GetInstance().GetSecureSessionManager(),
+        .dnssdServer                = app::DnssdServer::Instance(),
+        .commissioningWindowManager = Server::GetInstance().GetCommissioningWindowManager(),
+        .dacProvider                = *Credentials::GetDeviceAttestationCredentialsProvider(),
+        .groupDataProvider          = *Server::GetInstance().GetGroupDataProvider(),
+        .accessControl              = Access::GetAccessControl(),
+        .platformManager            = DeviceLayer::PlatformMgr(),
+        .eventManagement            = EventManagement::GetInstance(),
+    };
     OperationalCredentialsCluster cluster(kRootEndpointId, context);
 
     ASSERT_TRUE(IsAttributesListEqualTo(cluster,
@@ -67,12 +73,18 @@ TEST_F(TestOperationalCredentials, TestAttributes)
 
 TEST_F(TestOperationalCredentials, TestCommands)
 {
-    OperationalCredentialsCluster::Context context = { .fabricTable     = Server::GetInstance().GetFabricTable(),
-                                                       .failSafeContext = Server::GetInstance().GetFailSafeContext(),
-                                                       .sessionManager  = Server::GetInstance().GetSecureSessionManager(),
-                                                       .dnssdServer     = app::DnssdServer::Instance(),
-                                                       .commissioningWindowManager =
-                                                           Server::GetInstance().GetCommissioningWindowManager() };
+    OperationalCredentialsCluster::Context context = {
+        .fabricTable                = Server::GetInstance().GetFabricTable(),
+        .failSafeContext            = Server::GetInstance().GetFailSafeContext(),
+        .sessionManager             = Server::GetInstance().GetSecureSessionManager(),
+        .dnssdServer                = app::DnssdServer::Instance(),
+        .commissioningWindowManager = Server::GetInstance().GetCommissioningWindowManager(),
+        .dacProvider                = *Credentials::GetDeviceAttestationCredentialsProvider(),
+        .groupDataProvider          = *Server::GetInstance().GetGroupDataProvider(),
+        .accessControl              = Access::GetAccessControl(),
+        .platformManager            = DeviceLayer::PlatformMgr(),
+        .eventManagement            = EventManagement::GetInstance(),
+    };
     OperationalCredentialsCluster cluster(kRootEndpointId, context);
 
     EXPECT_TRUE(IsAcceptedCommandsListEqualTo(cluster,
diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/CodegenIntegration.cpp
similarity index 100%
rename from src/app/clusters/power-source-server/power-source-server.cpp
rename to src/app/clusters/power-source-server/CodegenIntegration.cpp
diff --git a/src/app/clusters/power-source-server/CodegenIntegration.h b/src/app/clusters/power-source-server/CodegenIntegration.h
new file mode 100644
index 00000000000..5199753e166
--- /dev/null
+++ b/src/app/clusters/power-source-server/CodegenIntegration.h
@@ -0,0 +1,61 @@
+/*
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/util/af-types.h>
+#include <app/util/basic-types.h>
+#include <lib/support/Span.h>
+#include <platform/CHIPDeviceConfig.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class PowerSourceServer
+{
+public:
+    static PowerSourceServer & Instance();
+
+    // Caller does not need to retain the span past the call point as these are copied into an internal storage
+    CHIP_ERROR SetEndpointList(EndpointId powerSourceClusterEndpoint, Span<EndpointId> endpointList);
+    CHIP_ERROR ClearEndpointList(EndpointId powerSourceClusterEndpoint)
+    {
+        return SetEndpointList(powerSourceClusterEndpoint, Span<EndpointId>());
+    }
+    // returns nullptr if there's not endpoint list set for this power source cluster endpoint id.
+    const Span<EndpointId> * GetEndpointList(EndpointId powerSourceClusterEndpoint) const;
+    void Shutdown();
+    size_t GetNumSupportedEndpointLists() const;
+};
+
+class PowerSourceAttrAccess : public AttributeAccessInterface
+{
+public:
+    // Register on all endpoints.
+    PowerSourceAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), PowerSource::Id) {}
+
+    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+};
+
+PowerSourceAttrAccess & TestOnlyGetPowerSourceAttrAccess();
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/power-source-server/app_config_dependent_sources.cmake b/src/app/clusters/power-source-server/app_config_dependent_sources.cmake
index b3106742a18..2214a367905 100644
--- a/src/app/clusters/power-source-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/power-source-server/app_config_dependent_sources.cmake
@@ -16,5 +16,5 @@
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
-    "${CLUSTER_DIR}/power-source-server.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
\ No newline at end of file
diff --git a/src/app/clusters/power-source-server/app_config_dependent_sources.gni b/src/app/clusters/power-source-server/app_config_dependent_sources.gni
index 77f042dfb87..2c3232e2a4b 100644
--- a/src/app/clusters/power-source-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/power-source-server/app_config_dependent_sources.gni
@@ -11,4 +11,4 @@
 # 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.
-app_config_dependent_sources = [ "power-source-server.cpp" ]
+app_config_dependent_sources = [ "CodegenIntegration.cpp" ]
diff --git a/src/app/clusters/power-source-server/power-source-server.h b/src/app/clusters/power-source-server/power-source-server.h
index 5199753e166..3d5b0e3e950 100644
--- a/src/app/clusters/power-source-server/power-source-server.h
+++ b/src/app/clusters/power-source-server/power-source-server.h
@@ -1,61 +1 @@
-/*
- *
- *    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.
- */
-
-#pragma once
-
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/util/af-types.h>
-#include <app/util/basic-types.h>
-#include <lib/support/Span.h>
-#include <platform/CHIPDeviceConfig.h>
-
-namespace chip {
-namespace app {
-namespace Clusters {
-
-class PowerSourceServer
-{
-public:
-    static PowerSourceServer & Instance();
-
-    // Caller does not need to retain the span past the call point as these are copied into an internal storage
-    CHIP_ERROR SetEndpointList(EndpointId powerSourceClusterEndpoint, Span<EndpointId> endpointList);
-    CHIP_ERROR ClearEndpointList(EndpointId powerSourceClusterEndpoint)
-    {
-        return SetEndpointList(powerSourceClusterEndpoint, Span<EndpointId>());
-    }
-    // returns nullptr if there's not endpoint list set for this power source cluster endpoint id.
-    const Span<EndpointId> * GetEndpointList(EndpointId powerSourceClusterEndpoint) const;
-    void Shutdown();
-    size_t GetNumSupportedEndpointLists() const;
-};
-
-class PowerSourceAttrAccess : public AttributeAccessInterface
-{
-public:
-    // Register on all endpoints.
-    PowerSourceAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), PowerSource::Id) {}
-
-    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
-};
-
-PowerSourceAttrAccess & TestOnlyGetPowerSourceAttrAccess();
-
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+#include "CodegenIntegration.h"
diff --git a/src/app/clusters/power-topology-server/CodegenIntegration.h b/src/app/clusters/power-topology-server/CodegenIntegration.h
index a5030fe8e94..e10c5cb23b8 100644
--- a/src/app/clusters/power-topology-server/CodegenIntegration.h
+++ b/src/app/clusters/power-topology-server/CodegenIntegration.h
@@ -17,8 +17,6 @@
  */
 #pragma once
 
-#include <lib/core/Optional.h>
-
 #include <app/clusters/power-topology-server/PowerTopologyCluster.h>
 #include <app/clusters/power-topology-server/PowerTopologyDelegate.h>
 
diff --git a/src/app/clusters/power-topology-server/power-topology-server.h b/src/app/clusters/power-topology-server/power-topology-server.h
index 442e9633569..3ab75d849e7 100644
--- a/src/app/clusters/power-topology-server/power-topology-server.h
+++ b/src/app/clusters/power-topology-server/power-topology-server.h
@@ -15,4 +15,4 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "CodegenIntegration.h"
+#include <app/clusters/power-topology-server/CodegenIntegration.h>
diff --git a/src/app/clusters/push-av-stream-transport-server/app_config_dependent_sources.cmake b/src/app/clusters/push-av-stream-transport-server/app_config_dependent_sources.cmake
index 687cc92fb14..4caeaefd425 100644
--- a/src/app/clusters/push-av-stream-transport-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/push-av-stream-transport-server/app_config_dependent_sources.cmake
@@ -13,6 +13,13 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.h"
+)
+
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
@@ -21,6 +28,4 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/PushAVStreamTransportLogic.cpp"
     "${CLUSTER_DIR}/PushAVStreamTransportLogic.h"
     "${CLUSTER_DIR}/push-av-stream-transport-delegate.h"
-    "${CLUSTER_DIR}/CodegenIntegration.cpp"
-    "${CLUSTER_DIR}/CodegenIntegration.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/scenes-server/app_config_dependent_sources.cmake b/src/app/clusters/scenes-server/app_config_dependent_sources.cmake
index 61456579d47..5a54ceff136 100644
--- a/src/app/clusters/scenes-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/scenes-server/app_config_dependent_sources.cmake
@@ -22,17 +22,5 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
     "${CLUSTER_DIR}/CodegenIntegration.h"
     "${CLUSTER_DIR}/scenes-server.h"
-
-    # these below would be pulled by GN (.gni file) dependency. CMAKE needs these directly
-    "${CLUSTER_DIR}/AttributeValuePairValidator.h"
-    "${CLUSTER_DIR}/ExtensionFieldSets.h"
-    "${CLUSTER_DIR}/ExtensionFieldSetsImpl.cpp"
-    "${CLUSTER_DIR}/ExtensionFieldSetsImpl.h"
-    "${CLUSTER_DIR}/SceneHandlerImpl.cpp"
-    "${CLUSTER_DIR}/SceneHandlerImpl.h"
-    "${CLUSTER_DIR}/ScenesManagementCluster.cpp"
-    "${CLUSTER_DIR}/ScenesManagementCluster.h"
-    "${CLUSTER_DIR}/SceneTable.h"
-    "${CLUSTER_DIR}/SceneTableImpl.cpp"
-    "${CLUSTER_DIR}/SceneTableImpl.h"
 )
+
diff --git a/src/app/clusters/scenes-server/tests/TestScenesManagementCluster.cpp b/src/app/clusters/scenes-server/tests/TestScenesManagementCluster.cpp
index adcd2963dee..6c063c94d17 100644
--- a/src/app/clusters/scenes-server/tests/TestScenesManagementCluster.cpp
+++ b/src/app/clusters/scenes-server/tests/TestScenesManagementCluster.cpp
@@ -165,6 +165,7 @@ class MockSceneHandler : public scenes::SceneHandler
 class MockGroupDataProvider : public GroupDataProvider
 {
 public:
+    MockGroupDataProvider() : GroupDataProvider(0, 0) {}
     CHIP_ERROR Init() override { return CHIP_NO_ERROR; }
     void Finish() override {}
     CHIP_ERROR SetGroupInfo(FabricIndex, const GroupInfo &) override { return CHIP_NO_ERROR; }
@@ -175,6 +176,8 @@ class MockGroupDataProvider : public GroupDataProvider
     CHIP_ERROR RemoveGroupInfoAt(FabricIndex, size_t) override { return CHIP_NO_ERROR; }
     bool HasEndpoint(FabricIndex fabric, GroupId group, EndpointId endpoint) override { return mHasEndpoint; }
     CHIP_ERROR AddEndpoint(FabricIndex, GroupId, EndpointId) override { return CHIP_NO_ERROR; }
+    CHIP_ERROR RemoveEndpoint(FabricIndex, GroupId, EndpointId, GroupCleanupPolicy) override { return CHIP_NO_ERROR; }
+    CHIP_ERROR RemoveEndpointAllGroups(FabricIndex, EndpointId, GroupCleanupPolicy) override { return CHIP_NO_ERROR; }
     CHIP_ERROR RemoveEndpoint(FabricIndex, GroupId, EndpointId) override { return CHIP_NO_ERROR; }
     CHIP_ERROR RemoveEndpoint(FabricIndex, EndpointId) override { return CHIP_NO_ERROR; }
     CHIP_ERROR RemoveEndpoints(FabricIndex fabric_index, GroupId group_id) override { return CHIP_NO_ERROR; }
@@ -199,6 +202,7 @@ class MockGroupDataProvider : public GroupDataProvider
     GroupSessionIterator * IterateGroupSessions(uint16_t) override { return nullptr; }
     Crypto::SymmetricKeyContext * GetKeyContext(FabricIndex, GroupId) override { return nullptr; }
     uint16_t getMaxMembershipCount() override { return 0; }
+    uint16_t getMaxMcastAddrCount() override { return 0; }
 
     bool mHasEndpoint = true;
 };
diff --git a/src/app/clusters/smoke-co-alarm-server/SmokeCOTestEventTriggerHandler.h b/src/app/clusters/smoke-co-alarm-server/SmokeCOTestEventTriggerHandler.h
index 47ecd03ff81..f2559976f58 100644
--- a/src/app/clusters/smoke-co-alarm-server/SmokeCOTestEventTriggerHandler.h
+++ b/src/app/clusters/smoke-co-alarm-server/SmokeCOTestEventTriggerHandler.h
@@ -52,6 +52,7 @@ enum class SmokeCOTrigger : uint64_t
     kForceSmokeCritical          = 0x005c'0000'0000009c,
     kForceCOCritical             = 0x005c'0000'0000009d,
     kForceLowBatteryCritical     = 0x005c'0000'0000009e,
+    kForceUnmountedState         = 0x005c'0000'0000009f,
     // Clear alarm commands
     kClearSmoke             = 0x005c'0000'000000a0,
     kClearCO                = 0x005c'0000'000000a1,
@@ -62,7 +63,8 @@ enum class SmokeCOTrigger : uint64_t
     kClearContamination     = 0x005c'0000'000000a6,
     kClearSensitivity       = 0x005c'0000'000000a8,
     kClearEndOfLife         = 0x005c'0000'000000aa,
-    kClearSilence           = 0x005c'0000'000000ab
+    kClearSilence           = 0x005c'0000'000000ab,
+    kClearUnmountedState    = 0x005c'0000'000000ac
 };
 
 class SmokeCOTestEventTriggerHandler : public TestEventTriggerHandler
diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp
index 3dfd00653bf..0bd1e6112e7 100644
--- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp
+++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp
@@ -52,6 +52,7 @@ void SmokeCoAlarmServer::SetExpressedStateByPriority(EndpointId endpointId,
         EndOfServiceEnum endOfServiceState = EndOfServiceEnum::kNormal;
         bool active                        = false;
         bool success                       = false;
+        bool unmounted                     = false;
 
         switch (priority)
         {
@@ -79,11 +80,15 @@ void SmokeCoAlarmServer::SetExpressedStateByPriority(EndpointId endpointId,
         case ExpressedStateEnum::kInterconnectCO:
             success = GetInterconnectCOAlarm(endpointId, alarmState);
             break;
+        case ExpressedStateEnum::kInoperative:
+            success = GetUnmountedState(endpointId, unmounted);
+            break;
         default:
             break;
         }
 
-        if (success && ((alarmState != AlarmStateEnum::kNormal) || (endOfServiceState != EndOfServiceEnum::kNormal) || active))
+        if (success &&
+            ((alarmState != AlarmStateEnum::kNormal) || (endOfServiceState != EndOfServiceEnum::kNormal) || active || unmounted))
         {
             SetExpressedState(endpointId, priority);
             return;
@@ -334,6 +339,29 @@ bool SmokeCoAlarmServer::SetSmokeSensitivityLevel(EndpointId endpointId, Sensiti
     return true;
 }
 
+bool SmokeCoAlarmServer::SetUnmountedState(EndpointId endpointId, bool isUnmounted)
+{
+    VerifyOrReturnValue(SetAttribute(endpointId, Unmounted::Id, Unmounted::Set, isUnmounted), false);
+    if (mInoperativeWhenUnmounted)
+    {
+        if (isUnmounted)
+        {
+            SetExpressedState(endpointId, ExpressedStateEnum::kInoperative);
+        }
+        else
+        {
+            ExpressedStateEnum expressedState;
+            VerifyOrReturnValue(GetAttribute(endpointId, ExpressedState::Id, ExpressedState::Get, expressedState), false);
+            if (expressedState == ExpressedStateEnum::kInoperative)
+            {
+                SetExpressedState(endpointId, ExpressedStateEnum::kNormal);
+            }
+        }
+    }
+
+    return true;
+}
+
 bool SmokeCoAlarmServer::GetExpressedState(chip ::EndpointId endpointId, ExpressedStateEnum & expressedState)
 {
     return GetAttribute(endpointId, ExpressedState::Id, ExpressedState::Get, expressedState);
@@ -399,6 +427,11 @@ bool SmokeCoAlarmServer::GetExpiryDate(EndpointId endpointId, uint32_t & expiryD
     return GetAttribute(endpointId, ExpiryDate::Id, ExpiryDate::Get, expiryDate);
 }
 
+bool SmokeCoAlarmServer::GetUnmountedState(EndpointId endpointId, bool & unmountedState)
+{
+    return GetAttribute(endpointId, Unmounted::Id, Unmounted::Get, unmountedState);
+}
+
 chip::BitFlags<Feature> SmokeCoAlarmServer::GetFeatures(EndpointId endpointId)
 {
     chip::BitFlags<Feature> featureMap;
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 68b048e29bf..55c25f82862 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
@@ -36,7 +36,7 @@ class SmokeCoAlarmServer
     static SmokeCoAlarmServer & Instance();
 
     /* Expected byte size of the PriorityOrder */
-    static constexpr size_t kPriorityOrderLength = 8;
+    static constexpr size_t kPriorityOrderLength = 9;
 
     using AlarmStateEnum         = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
     using ContaminationStateEnum = chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum;
@@ -76,6 +76,17 @@ class SmokeCoAlarmServer
     bool SetInterconnectCOAlarm(chip::EndpointId endpointId, AlarmStateEnum newInterconnectCOAlarm);
     bool SetContaminationState(chip::EndpointId endpointId, ContaminationStateEnum newContaminationState);
     bool SetSmokeSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum newSmokeSensitivityLevel);
+    /**
+     * @brief Sets unmounted attribute and updates expressed state respectively.
+     * @param endpointId ID of the endpoint
+     * @param isUnmounted unmounted state
+     * @return true on success, false on failure
+     */
+    bool SetUnmountedState(chip::EndpointId endpointId, bool isUnmounted);
+    /**
+     * @brief If set to true, unmounting the device leads to inoperative state.
+     */
+    void SetInoperativeWhenUnmounted(bool inoperative) { mInoperativeWhenUnmounted = inoperative; }
 
     bool GetExpressedState(chip::EndpointId endpointId, ExpressedStateEnum & expressedState);
     bool GetSmokeState(chip::EndpointId endpointId, AlarmStateEnum & smokeState);
@@ -90,6 +101,8 @@ class SmokeCoAlarmServer
     bool GetContaminationState(chip::EndpointId endpointId, ContaminationStateEnum & contaminationState);
     bool GetSmokeSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum & smokeSensitivityLevel);
     bool GetExpiryDate(chip::EndpointId endpointId, uint32_t & expiryDate);
+    bool GetUnmountedState(chip::EndpointId endpointId, bool & unmountedState);
+    void GetInoperativeWhenUnmounted(bool & inoperative) { inoperative = mInoperativeWhenUnmounted; }
 
     chip::BitFlags<Feature> GetFeatures(chip::EndpointId endpointId);
 
@@ -161,6 +174,7 @@ class SmokeCoAlarmServer
         const chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::DecodableType & commandData);
 
     static SmokeCoAlarmServer sInstance;
+    bool mInoperativeWhenUnmounted = false;
 };
 
 // =============================================================================
diff --git a/src/app/clusters/software-diagnostics-server/app_config_dependent_sources.cmake b/src/app/clusters/software-diagnostics-server/app_config_dependent_sources.cmake
index aa390dbf949..6981c76119a 100644
--- a/src/app/clusters/software-diagnostics-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/software-diagnostics-server/app_config_dependent_sources.cmake
@@ -17,20 +17,5 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
-    "${CLUSTER_DIR}/SoftwareDiagnosticsCluster.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/SoftwareDiagnosticsCluster.h"
-)
-
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/software-fault-listener.cpp"
-    "${CLUSTER_DIR}/software-fault-listener.h"
-)
diff --git a/src/app/clusters/temperature-measurement-server/BUILD.gn b/src/app/clusters/temperature-measurement-server/BUILD.gn
new file mode 100644
index 00000000000..7bd270efac4
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/BUILD.gn
@@ -0,0 +1,29 @@
+# Copyright (c) 2026 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")
+
+source_set("temperature-measurement-server") {
+  sources = [
+    "TemperatureMeasurementCluster.cpp",
+    "TemperatureMeasurementCluster.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/app/data-model-provider",
+    "${chip_root}/src/app/server",
+    "${chip_root}/src/app/server-cluster",
+    "${chip_root}/zzz_generated/app-common/clusters/TemperatureMeasurement",
+  ]
+}
diff --git a/src/app/clusters/temperature-measurement-server/CodegenIntegration.cpp b/src/app/clusters/temperature-measurement-server/CodegenIntegration.cpp
new file mode 100644
index 00000000000..ea7f58b82c9
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/CodegenIntegration.cpp
@@ -0,0 +1,155 @@
+/*
+ *
+ *    Copyright (c) 2026 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/temperature-measurement-server/CodegenIntegration.h>
+#include <app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h>
+#include <app/static-cluster-config/TemperatureMeasurement.h>
+#include <app/util/attribute-storage.h>
+#include <data-model-providers/codegen/ClusterIntegration.h>
+#include <data-model-providers/codegen/CodegenDataModelProvider.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::TemperatureMeasurement;
+using namespace chip::app::Clusters::TemperatureMeasurement::Attributes;
+
+namespace {
+
+constexpr size_t kTemperatureMeasurementFixedClusterCount =
+    TemperatureMeasurement::StaticApplicationConfig::kFixedClusterConfig.size();
+constexpr size_t kTemperatureMeasurementMaxClusterCount =
+    kTemperatureMeasurementFixedClusterCount + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
+
+LazyRegisteredServerCluster<TemperatureMeasurementCluster> gServers[kTemperatureMeasurementMaxClusterCount];
+
+class IntegrationDelegate : public CodegenClusterIntegration::Delegate
+{
+public:
+    ServerClusterRegistration & CreateRegistration(EndpointId endpointId, unsigned clusterInstanceIndex,
+                                                   uint32_t optionalAttributeBits, uint32_t featureMap) override
+    {
+        TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributeSet(optionalAttributeBits);
+        using namespace chip::Protocols::InteractionModel;
+
+        // Try to read the default value for these mandatory attributes but do not fail if the operation is not successful.
+        // This is because not all apps are setting a default value for them in ember.
+        DataModel::Nullable<int16_t> minMeasuredValue{};
+        if (MinMeasuredValue::Get(endpointId, minMeasuredValue) != Status::Success)
+        {
+            minMeasuredValue.SetNull();
+        }
+
+        DataModel::Nullable<int16_t> maxMeasuredValue{};
+        if (MaxMeasuredValue::Get(endpointId, maxMeasuredValue) != Status::Success)
+        {
+            maxMeasuredValue.SetNull();
+        }
+
+        uint16_t tolerance{};
+        if (optionalAttributeSet.IsSet(Tolerance::Id))
+        {
+            VerifyOrDie(Tolerance::Get(endpointId, &tolerance) == Status::Success);
+        }
+
+        gServers[clusterInstanceIndex].Create(endpointId, optionalAttributeSet,
+                                              TemperatureMeasurementCluster::StartupConfiguration{
+                                                  .minMeasuredValue = minMeasuredValue,
+                                                  .maxMeasuredValue = maxMeasuredValue,
+                                                  .tolerance        = tolerance,
+                                              });
+        return gServers[clusterInstanceIndex].Registration();
+    }
+
+    ServerClusterInterface * FindRegistration(unsigned clusterInstanceIndex) override
+    {
+        VerifyOrReturnValue(gServers[clusterInstanceIndex].IsConstructed(), nullptr);
+        return &gServers[clusterInstanceIndex].Cluster();
+    }
+
+    void ReleaseRegistration(unsigned clusterInstanceIndex) override { gServers[clusterInstanceIndex].Destroy(); }
+};
+
+} // namespace
+
+void MatterTemperatureMeasurementClusterInitCallback(EndpointId endpointId)
+{
+    IntegrationDelegate integrationDelegate;
+
+    CodegenClusterIntegration::RegisterServer(
+        {
+            .endpointId                = endpointId,
+            .clusterId                 = TemperatureMeasurement::Id,
+            .fixedClusterInstanceCount = kTemperatureMeasurementFixedClusterCount,
+            .maxClusterInstanceCount   = kTemperatureMeasurementMaxClusterCount,
+            .fetchFeatureMap           = false,
+            .fetchOptionalAttributes   = true,
+        },
+        integrationDelegate);
+}
+
+void MatterTemperatureMeasurementClusterShutdownCallback(EndpointId endpointId, MatterClusterShutdownType shutdownType)
+{
+    IntegrationDelegate integrationDelegate;
+
+    CodegenClusterIntegration::UnregisterServer(
+        {
+            .endpointId                = endpointId,
+            .clusterId                 = TemperatureMeasurement::Id,
+            .fixedClusterInstanceCount = kTemperatureMeasurementFixedClusterCount,
+            .maxClusterInstanceCount   = kTemperatureMeasurementMaxClusterCount,
+        },
+        integrationDelegate, shutdownType);
+}
+
+namespace chip::app::Clusters::TemperatureMeasurement {
+
+TemperatureMeasurementCluster * FindClusterOnEndpoint(EndpointId endpointId)
+{
+    IntegrationDelegate integrationDelegate;
+
+    ServerClusterInterface * temperatureMeasurement = CodegenClusterIntegration::FindClusterOnEndpoint(
+        {
+            .endpointId                = endpointId,
+            .clusterId                 = TemperatureMeasurement::Id,
+            .fixedClusterInstanceCount = kTemperatureMeasurementFixedClusterCount,
+            .maxClusterInstanceCount   = kTemperatureMeasurementMaxClusterCount,
+        },
+        integrationDelegate);
+
+    return static_cast<TemperatureMeasurementCluster *>(temperatureMeasurement);
+}
+
+CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<int16_t> measuredValue)
+{
+    auto temperatureMeasurement = FindClusterOnEndpoint(endpointId);
+    VerifyOrReturnError(temperatureMeasurement != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    return temperatureMeasurement->SetMeasuredValue(measuredValue);
+}
+
+CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<int16_t> minMeasuredValue,
+                                 DataModel::Nullable<int16_t> maxMeasuredValue)
+{
+    auto temperatureMeasurement = FindClusterOnEndpoint(endpointId);
+    VerifyOrReturnError(temperatureMeasurement != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    return temperatureMeasurement->SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue);
+}
+
+} // namespace chip::app::Clusters::TemperatureMeasurement
diff --git a/src/app/clusters/temperature-measurement-server/CodegenIntegration.h b/src/app/clusters/temperature-measurement-server/CodegenIntegration.h
new file mode 100644
index 00000000000..3c5c91c4b6d
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/CodegenIntegration.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2026 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 <app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h>
+
+namespace chip::app::Clusters::TemperatureMeasurement {
+
+TemperatureMeasurementCluster * FindClusterOnEndpoint(EndpointId endpointId);
+
+CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<int16_t> measuredValue);
+CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<int16_t> minMeasuredValue,
+                                 DataModel::Nullable<int16_t> maxMeasuredValue);
+
+} // namespace chip::app::Clusters::TemperatureMeasurement
diff --git a/src/app/clusters/temperature-measurement-server/README.md b/src/app/clusters/temperature-measurement-server/README.md
new file mode 100644
index 00000000000..d5357afe644
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/README.md
@@ -0,0 +1,22 @@
+This cluster is currently following a code driven approach.
+
+This means that the Accessors for the attribute MeasuredValue are no longer
+available.
+
+Now to set the value for this attribute the following code change applies:
+
+# BEFORE (using the Accessors)
+
+    app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(1000));
+
+# CURRENT (using the code driven approach)
+
+    CHIP_ERROR err = app::Clusters::TemperatureMeasurement::SetMeasuredValue(1, static_cast<int16_t>(1000));
+    if (err == CHIP_NO_ERROR)
+    {
+        // SetMeasuredValue() succeeded
+    }
+    else
+    {
+        // SetMeasuredValue() failed
+    }
diff --git a/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.cpp b/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.cpp
new file mode 100644
index 00000000000..a3b05ebb7e0
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.cpp
@@ -0,0 +1,129 @@
+/*
+ *    Copyright (c) 2026 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/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h>
+#include <app/server-cluster/AttributeListBuilder.h>
+#include <clusters/TemperatureMeasurement/Metadata.h>
+
+namespace chip::app::Clusters {
+
+using namespace TemperatureMeasurement::Attributes;
+
+// According to the spec, absolute minimum value is -27315
+constexpr int16_t kMinMeasuredValueRange = -27315;
+// According to the spec, maximum minimum value is 32766
+constexpr int16_t kMaxMeasuredValueRange = 32766;
+// According to the spec, maximum tolerance value is 2048
+constexpr uint16_t kMaxTolerance = 2048;
+
+TemperatureMeasurementCluster::TemperatureMeasurementCluster(EndpointId endpointId,
+                                                             const OptionalAttributeSet & optionalAttributeSet,
+                                                             const StartupConfiguration & config) :
+    DefaultServerCluster({ endpointId, TemperatureMeasurement::Id }),
+    mOptionalAttributeSet(optionalAttributeSet)
+{
+    if (!config.minMeasuredValue.IsNull())
+    {
+        VerifyOrDie(config.minMeasuredValue.Value() >= kMinMeasuredValueRange &&
+                    config.minMeasuredValue.Value() <= kMaxMeasuredValueRange);
+
+        if (!config.maxMeasuredValue.IsNull())
+        {
+            VerifyOrDie(config.maxMeasuredValue.Value() >= config.minMeasuredValue.Value() + 1);
+        }
+    }
+
+    VerifyOrDie(!mOptionalAttributeSet.IsSet(Tolerance::Id) || config.tolerance <= kMaxTolerance);
+
+    mMinMeasuredValue = config.minMeasuredValue;
+    mMaxMeasuredValue = config.maxMeasuredValue;
+    mTolerance        = config.tolerance;
+}
+
+DataModel::ActionReturnStatus TemperatureMeasurementCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                                           AttributeValueEncoder & encoder)
+{
+    switch (request.path.mAttributeId)
+    {
+    case ClusterRevision::Id:
+        return encoder.Encode(TemperatureMeasurement::kRevision);
+    case FeatureMap::Id:
+        return encoder.Encode<uint32_t>(0);
+    case MeasuredValue::Id:
+        return encoder.Encode(mMeasuredValue);
+    case MinMeasuredValue::Id:
+        return encoder.Encode(mMinMeasuredValue);
+    case MaxMeasuredValue::Id:
+        return encoder.Encode(mMaxMeasuredValue);
+    case Tolerance::Id:
+        return encoder.Encode(mTolerance);
+    default:
+        return Protocols::InteractionModel::Status::UnsupportedAttribute;
+    }
+}
+
+CHIP_ERROR TemperatureMeasurementCluster::Attributes(const ConcreteClusterPath & path,
+                                                     ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder)
+{
+    AttributeListBuilder listBuilder(builder);
+
+    const DataModel::AttributeEntry optionalAttributes[] = {
+        Tolerance::kMetadataEntry, //
+    };
+
+    return listBuilder.Append(Span(kMandatoryMetadata), Span(optionalAttributes), mOptionalAttributeSet);
+}
+
+CHIP_ERROR TemperatureMeasurementCluster::SetMeasuredValue(DataModel::Nullable<int16_t> measuredValue)
+{
+    if (!measuredValue.IsNull())
+    {
+        if (!mMinMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(measuredValue.Value() >= mMinMeasuredValue.Value(), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
+
+        if (!mMaxMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(measuredValue.Value() <= mMaxMeasuredValue.Value(), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
+    }
+
+    SetAttributeValue(mMeasuredValue, measuredValue, MeasuredValue::Id);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TemperatureMeasurementCluster::SetMeasuredValueRange(DataModel::Nullable<int16_t> minMeasuredValue,
+                                                                DataModel::Nullable<int16_t> maxMeasuredValue)
+{
+    if (!minMeasuredValue.IsNull())
+    {
+        VerifyOrReturnError(minMeasuredValue.Value() >= kMinMeasuredValueRange &&
+                                minMeasuredValue.Value() <= kMaxMeasuredValueRange,
+                            CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+        if (!maxMeasuredValue.IsNull())
+        {
+            VerifyOrReturnError(maxMeasuredValue.Value() >= minMeasuredValue.Value() + 1, CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        }
+    }
+
+    SetAttributeValue(mMinMeasuredValue, minMeasuredValue, MinMeasuredValue::Id);
+    SetAttributeValue(mMaxMeasuredValue, maxMeasuredValue, MaxMeasuredValue::Id);
+    return CHIP_NO_ERROR;
+}
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h b/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h
new file mode 100644
index 00000000000..b1990993986
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h
@@ -0,0 +1,62 @@
+/*
+ *    Copyright (c) 2026 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 <app-common/zap-generated/attributes/Accessors.h>
+#include <app/server-cluster/DefaultServerCluster.h>
+#include <app/server-cluster/OptionalAttributeSet.h>
+#include <clusters/TemperatureMeasurement/Attributes.h>
+#include <clusters/TemperatureMeasurement/Metadata.h>
+
+namespace chip::app::Clusters {
+
+class TemperatureMeasurementCluster : public DefaultServerCluster
+{
+public:
+    using OptionalAttributeSet = app::OptionalAttributeSet<TemperatureMeasurement::Attributes::Tolerance::Id>;
+
+    struct StartupConfiguration
+    {
+        DataModel::Nullable<int16_t> minMeasuredValue{};
+        DataModel::Nullable<int16_t> maxMeasuredValue{};
+        uint16_t tolerance{};
+    };
+
+    TemperatureMeasurementCluster(EndpointId endpointId, const OptionalAttributeSet & optionalAttributeSet,
+                                  const StartupConfiguration & config);
+
+    // Server cluster implementation
+    DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                AttributeValueEncoder & encoder) override;
+    CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
+
+    CHIP_ERROR SetMeasuredValue(DataModel::Nullable<int16_t> measuredValue);
+    DataModel::Nullable<int16_t> GetMeasuredValue() const { return mMeasuredValue; }
+
+    CHIP_ERROR SetMeasuredValueRange(DataModel::Nullable<int16_t> minMeasuredValue, DataModel::Nullable<int16_t> maxMeasuredValue);
+    DataModel::Nullable<int16_t> GetMinMeasuredValue() const { return mMinMeasuredValue; }
+    DataModel::Nullable<int16_t> GetMaxMeasuredValue() const { return mMaxMeasuredValue; }
+
+protected:
+    const OptionalAttributeSet mOptionalAttributeSet;
+    DataModel::Nullable<int16_t> mMeasuredValue{};
+    DataModel::Nullable<int16_t> mMinMeasuredValue{};
+    DataModel::Nullable<int16_t> mMaxMeasuredValue{};
+    uint16_t mTolerance{};
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.cmake b/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.cmake
new file mode 100644
index 00000000000..f4882ca070e
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.cmake
@@ -0,0 +1,20 @@
+# Copyright (c) 2026 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.
+# This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
+   "${CLUSTER_DIR}/CodegenIntegration.cpp"
+   "${CLUSTER_DIR}/CodegenIntegration.h"
+)
diff --git a/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.gni b/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.gni
new file mode 100644
index 00000000000..7ddc0b7a10b
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/app_config_dependent_sources.gni
@@ -0,0 +1,17 @@
+# Copyright (c) 2026 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.
+app_config_dependent_sources = [
+  "CodegenIntegration.cpp",
+  "CodegenIntegration.h",
+]
diff --git a/src/app/clusters/temperature-measurement-server/tests/BUILD.gn b/src/app/clusters/temperature-measurement-server/tests/BUILD.gn
new file mode 100644
index 00000000000..331e3901075
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/tests/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright (c) 2026 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/pigweed.gni")
+
+import("${chip_root}/build/chip/chip_test_suite.gni")
+
+chip_test_suite("tests") {
+  output_name = "libTestTemperatureMeasurementCluster"
+
+  test_sources = [ "TestTemperatureMeasurementCluster.cpp" ]
+
+  sources = []
+
+  cflags = [ "-Wconversion" ]
+
+  public_deps = [
+    "${chip_root}/src/app/clusters/temperature-measurement-server",
+    "${chip_root}/src/app/server-cluster/testing",
+    "${chip_root}/src/lib/support",
+  ]
+}
diff --git a/src/app/clusters/temperature-measurement-server/tests/TestTemperatureMeasurementCluster.cpp b/src/app/clusters/temperature-measurement-server/tests/TestTemperatureMeasurementCluster.cpp
new file mode 100644
index 00000000000..f461fac9f92
--- /dev/null
+++ b/src/app/clusters/temperature-measurement-server/tests/TestTemperatureMeasurementCluster.cpp
@@ -0,0 +1,271 @@
+/*
+ *    Copyright (c) 2025 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 <pw_unit_test/framework.h>
+
+#include <app/clusters/temperature-measurement-server/TemperatureMeasurementCluster.h>
+#include <app/server-cluster/AttributeListBuilder.h>
+#include <app/server-cluster/testing/AttributeTesting.h>
+#include <app/server-cluster/testing/ClusterTester.h>
+#include <app/server-cluster/testing/TestServerClusterContext.h>
+
+namespace {
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::TemperatureMeasurement;
+using namespace chip::app::Clusters::TemperatureMeasurement::Attributes;
+using namespace chip::Testing;
+
+struct TestTemperatureMeasurementCluster : public ::testing::Test
+{
+    static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
+
+    static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
+
+    TestTemperatureMeasurementCluster() {}
+
+    TestServerClusterContext testContext;
+};
+
+void TestMandatoryAttributes(ClusterTester & tester)
+{
+    uint16_t revision{};
+    ASSERT_EQ(tester.ReadAttribute(ClusterRevision::Id, revision), CHIP_NO_ERROR);
+
+    uint32_t featureMap{};
+    ASSERT_EQ(tester.ReadAttribute(FeatureMap::Id, featureMap), CHIP_NO_ERROR);
+
+    DataModel::Nullable<int16_t> measuredValue{};
+    ASSERT_EQ(tester.ReadAttribute(MeasuredValue::Id, measuredValue), CHIP_NO_ERROR);
+
+    DataModel::Nullable<int16_t> minMeasuredValue{};
+    ASSERT_EQ(tester.ReadAttribute(MinMeasuredValue::Id, minMeasuredValue), CHIP_NO_ERROR);
+
+    DataModel::Nullable<int16_t> maxMeasuredValue{};
+    ASSERT_EQ(tester.ReadAttribute(MaxMeasuredValue::Id, maxMeasuredValue), CHIP_NO_ERROR);
+}
+
+} // namespace
+
+TEST_F(TestTemperatureMeasurementCluster, AttributeTest)
+{
+    {
+        TemperatureMeasurementCluster cluster(kRootEndpointId, TemperatureMeasurementCluster::OptionalAttributeSet(),
+                                              TemperatureMeasurementCluster::StartupConfiguration{});
+        ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+        ReadOnlyBufferBuilder<DataModel::AttributeEntry> attributes;
+        ASSERT_EQ(cluster.Attributes(ConcreteClusterPath(kRootEndpointId, TemperatureMeasurement::Id), attributes), CHIP_NO_ERROR);
+
+        ReadOnlyBufferBuilder<DataModel::AttributeEntry> expected;
+        AttributeListBuilder listBuilder(expected);
+        ASSERT_EQ(listBuilder.Append(Span(kMandatoryMetadata), {}), CHIP_NO_ERROR);
+        ASSERT_TRUE(chip::Testing::EqualAttributeSets(attributes.TakeBuffer(), expected.TakeBuffer()));
+
+        cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+    }
+
+    {
+        const DataModel::AttributeEntry optionalAttributes[] = { Tolerance::kMetadataEntry };
+        TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributeSet;
+        optionalAttributeSet.Set<Tolerance::Id>();
+        TemperatureMeasurementCluster cluster(kRootEndpointId, optionalAttributeSet,
+                                              TemperatureMeasurementCluster::StartupConfiguration{});
+        ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+        ReadOnlyBufferBuilder<DataModel::AttributeEntry> attributes;
+        ASSERT_EQ(cluster.Attributes(ConcreteClusterPath(kRootEndpointId, TemperatureMeasurement::Id), attributes), CHIP_NO_ERROR);
+
+        ReadOnlyBufferBuilder<DataModel::AttributeEntry> expected;
+        AttributeListBuilder listBuilder(expected);
+        ASSERT_EQ(listBuilder.Append(Span(kMandatoryMetadata), Span(optionalAttributes), optionalAttributeSet), CHIP_NO_ERROR);
+        ASSERT_TRUE(chip::Testing::EqualAttributeSets(attributes.TakeBuffer(), expected.TakeBuffer()));
+
+        cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+    }
+}
+
+TEST_F(TestTemperatureMeasurementCluster, ReadAttributeTest)
+{
+    {
+        TemperatureMeasurementCluster cluster(kRootEndpointId, TemperatureMeasurementCluster::OptionalAttributeSet(),
+                                              TemperatureMeasurementCluster::StartupConfiguration{});
+        ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+        ClusterTester tester(cluster);
+
+        TestMandatoryAttributes(tester);
+
+        cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+    }
+
+    {
+        TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributeSet;
+        optionalAttributeSet.Set<Tolerance::Id>();
+        TemperatureMeasurementCluster cluster(kRootEndpointId, optionalAttributeSet,
+                                              TemperatureMeasurementCluster::StartupConfiguration{});
+        ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+        ClusterTester tester(cluster);
+
+        TestMandatoryAttributes(tester);
+
+        uint16_t tolerance{};
+        ASSERT_EQ(tester.ReadAttribute(Tolerance::Id, tolerance), CHIP_NO_ERROR);
+
+        cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+    }
+}
+
+TEST_F(TestTemperatureMeasurementCluster, MeasuredValue)
+{
+    TemperatureMeasurementCluster cluster(kRootEndpointId, TemperatureMeasurementCluster::OptionalAttributeSet(),
+                                          TemperatureMeasurementCluster::StartupConfiguration{
+                                              .minMeasuredValue = DataModel::Nullable<int16_t>(1),
+                                              .maxMeasuredValue = DataModel::Nullable<int16_t>(3),
+                                          });
+    ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+    DataModel::Nullable<int16_t> measuredValue{};
+    measuredValue.SetNonNull(0);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue.Value()), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNonNull(1);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    DataModel::Nullable<int16_t> measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(2);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(3);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal.Value(), measuredValue.Value());
+
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+    measuredVal = cluster.GetMeasuredValue();
+    EXPECT_EQ(measuredVal, measuredValue);
+
+    DataModel::Nullable<int16_t> minMeasuredValue{};
+    DataModel::Nullable<int16_t> maxMeasuredValue{};
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(0);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue.Value()), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(32766);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(-27316);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    minMeasuredValue.SetNonNull(1);
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(0);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue.Value()), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNonNull(32766);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNonNull(3);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+
+    measuredValue.SetNonNull(4);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    measuredValue.SetNonNull(-27316);
+    EXPECT_EQ(cluster.SetMeasuredValue(measuredValue), CHIP_NO_ERROR);
+
+    cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+}
+
+TEST_F(TestTemperatureMeasurementCluster, MeasuredValueRange)
+{
+    TemperatureMeasurementCluster cluster(kRootEndpointId, TemperatureMeasurementCluster::OptionalAttributeSet(),
+                                          TemperatureMeasurementCluster::StartupConfiguration{});
+    ASSERT_EQ(cluster.Startup(testContext.Get()), CHIP_NO_ERROR);
+
+    DataModel::Nullable<int16_t> minMeasuredValue{};
+    DataModel::Nullable<int16_t> maxMeasuredValue{};
+    minMeasuredValue.SetNonNull(-27315);
+    maxMeasuredValue.SetNonNull(-27314);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    DataModel::Nullable<int16_t> minMeasuredVal = cluster.GetMinMeasuredValue();
+    DataModel::Nullable<int16_t> maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal.Value(), minMeasuredValue.Value());
+    EXPECT_EQ(maxMeasuredVal.Value(), maxMeasuredValue.Value());
+
+    minMeasuredValue.SetNonNull(32766);
+    maxMeasuredValue.SetNonNull(32767);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal.Value(), minMeasuredValue.Value());
+    EXPECT_EQ(maxMeasuredVal.Value(), maxMeasuredValue.Value());
+
+    minMeasuredValue.SetNonNull(-27316);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNonNull(32767);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNonNull(32766);
+    maxMeasuredValue.SetNonNull(32766);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    minMeasuredValue.SetNonNull(32766);
+    maxMeasuredValue.SetNull();
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    minMeasuredValue.SetNull();
+    maxMeasuredValue.SetNonNull(32766);
+    EXPECT_EQ(cluster.SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue), CHIP_NO_ERROR);
+    minMeasuredVal = cluster.GetMinMeasuredValue();
+    maxMeasuredVal = cluster.GetMaxMeasuredValue();
+    EXPECT_EQ(minMeasuredVal, minMeasuredValue);
+    EXPECT_EQ(maxMeasuredVal, maxMeasuredValue);
+
+    cluster.Shutdown(ClusterShutdownType::kClusterShutdown);
+}
diff --git a/src/app/clusters/thread-network-diagnostics-server/ThreadNetworkDiagnosticsProvider.cpp b/src/app/clusters/thread-network-diagnostics-server/ThreadNetworkDiagnosticsProvider.cpp
index 81544357736..82fa0b929de 100644
--- a/src/app/clusters/thread-network-diagnostics-server/ThreadNetworkDiagnosticsProvider.cpp
+++ b/src/app/clusters/thread-network-diagnostics-server/ThreadNetworkDiagnosticsProvider.cpp
@@ -103,8 +103,8 @@ CHIP_ERROR WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, a
 
     case Attributes::RoutingRole::Id: {
         using ThreadNetworkDiagnostics::RoutingRoleEnum;
-        RoutingRoleEnum routingRole;
-        otDeviceRole otRole = otThreadGetDeviceRole(otInst);
+        RoutingRoleEnum routingRole = RoutingRoleEnum::kUnspecified;
+        otDeviceRole otRole         = otThreadGetDeviceRole(otInst);
 
         if (otRole == OT_DEVICE_ROLE_DISABLED)
         {
diff --git a/src/app/clusters/tls-certificate-management-server/app_config_dependent_sources.cmake b/src/app/clusters/tls-certificate-management-server/app_config_dependent_sources.cmake
index ace17e9b293..161e5cf0ee2 100644
--- a/src/app/clusters/tls-certificate-management-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/tls-certificate-management-server/app_config_dependent_sources.cmake
@@ -13,12 +13,17 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+        ${APP_TARGET}
+        PRIVATE
+        "${CLUSTER_DIR}/CodegenIntegration.cpp"
+)
+
 TARGET_SOURCES(
         ${APP_TARGET}
         PRIVATE
         "${CLUSTER_DIR}/CertificateTableImpl.cpp"
         "${CLUSTER_DIR}/CertificateTableImpl.h"
-        "${CLUSTER_DIR}/CodegenIntegration.cpp"
         "${CLUSTER_DIR}/TLSCertificateManagementCluster.cpp"
         "${CLUSTER_DIR}/TLSCertificateManagementCluster.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/tls-client-management-server/app_config_dependent_sources.cmake b/src/app/clusters/tls-client-management-server/app_config_dependent_sources.cmake
index 0bd5f5b6857..4681527c720 100644
--- a/src/app/clusters/tls-client-management-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/tls-client-management-server/app_config_dependent_sources.cmake
@@ -13,12 +13,17 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+TARGET_SOURCES(
+        ${APP_TARGET}
+        PRIVATE
+        "${CLUSTER_DIR}/CodegenIntegration.cpp"
+)
+
 TARGET_SOURCES(
         ${APP_TARGET}
         PRIVATE
         "${CHIP_APP_BASE_DIR}/clusters/tls-certificate-management-server/CertificateTableImpl.cpp"
         "${CHIP_APP_BASE_DIR}/clusters/tls-certificate-management-server/CertificateTableImpl.h"
-        "${CLUSTER_DIR}/CodegenIntegration.cpp"
         "${CLUSTER_DIR}/TLSClientManagementCluster.cpp"
         "${CLUSTER_DIR}/TLSClientManagementCluster.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/webrtc-transport-provider-server/app_config_dependent_sources.cmake b/src/app/clusters/webrtc-transport-provider-server/app_config_dependent_sources.cmake
index 4900a0d1268..d2b024192c5 100644
--- a/src/app/clusters/webrtc-transport-provider-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/webrtc-transport-provider-server/app_config_dependent_sources.cmake
@@ -12,11 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# These are the things that BUILD.gn dependencies would pull
+# This is the equivalent to app_config_dependent_sources.gni
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
+)
+
+# These are the things that BUILD.gn dependencies would pull
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
     "${CLUSTER_DIR}/WebRTCTransportProviderCluster.cpp"
     "${CLUSTER_DIR}/WebRTCTransportProviderCluster.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/wifi-network-diagnostics-server/app_config_dependent_sources.cmake b/src/app/clusters/wifi-network-diagnostics-server/app_config_dependent_sources.cmake
index d2cda0e504d..6981c76119a 100644
--- a/src/app/clusters/wifi-network-diagnostics-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/wifi-network-diagnostics-server/app_config_dependent_sources.cmake
@@ -19,12 +19,3 @@ TARGET_SOURCES(
     "${CLUSTER_DIR}/CodegenIntegration.cpp"
 )
 
-# These are the things that BUILD.gn dependencies would pull
-TARGET_SOURCES(
-  ${APP_TARGET}
-  PRIVATE
-    "${CLUSTER_DIR}/WiFiDiagnosticsTestEventTriggerHandler.h"
-    "${CLUSTER_DIR}/WiFiNetworkDiagnosticsCluster.cpp"
-    "${CLUSTER_DIR}/WiFiNetworkDiagnosticsCluster.h"
-
-)
diff --git a/src/app/clusters/wifi-network-management-server/BUILD.gn b/src/app/clusters/wifi-network-management-server/BUILD.gn
index 2204b14285a..8edc9018df9 100644
--- a/src/app/clusters/wifi-network-management-server/BUILD.gn
+++ b/src/app/clusters/wifi-network-management-server/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2025 Project CHIP Authors
+# Copyright (c) 2025-2026 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.
@@ -11,5 +11,19 @@
 # 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.
-group("wifi-network-management-server") {
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+source_set("wifi-network-management-server") {
+  sources = [
+    "WiFiNetworkManagementCluster.cpp",
+    "WiFiNetworkManagementCluster.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/app:interaction-model",
+    "${chip_root}/src/app/server-cluster",
+    "${chip_root}/src/crypto",
+    "${chip_root}/zzz_generated/app-common/clusters/WiFiNetworkManagement",
+  ]
 }
diff --git a/src/app/clusters/wifi-network-management-server/CodegenIntegration.cpp b/src/app/clusters/wifi-network-management-server/CodegenIntegration.cpp
new file mode 100644
index 00000000000..68c973725bb
--- /dev/null
+++ b/src/app/clusters/wifi-network-management-server/CodegenIntegration.cpp
@@ -0,0 +1,42 @@
+/**
+ *
+ *    Copyright (c) 2026 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/clusters/wifi-network-management-server/CodegenIntegration.h>
+#include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <lib/support/CodeUtils.h>
+
+using namespace chip::app::Clusters;
+
+WiFiNetworkManagementServer::~WiFiNetworkManagementServer()
+{
+    LogErrorOnFailure(Deinit().NoErrorIf(CHIP_ERROR_NOT_FOUND));
+}
+
+CHIP_ERROR WiFiNetworkManagementServer::Init()
+{
+    return CodegenDataModelProvider::Instance().Registry().Register(mRegistration);
+}
+
+CHIP_ERROR WiFiNetworkManagementServer::Deinit(ClusterShutdownType clusterShutdownType)
+{
+    return CodegenDataModelProvider::Instance().Registry().Unregister(this, clusterShutdownType);
+}
+
+void MatterWiFiNetworkManagementClusterInitCallback(chip::EndpointId) {}
+void MatterWiFiNetworkManagementClusterShutdownCallback(chip::EndpointId, MatterClusterShutdownType) {}
+void MatterWiFiNetworkManagementPluginServerInitCallback() {}
+void MatterWiFiNetworkManagementPluginServerShutdownCallback() {}
diff --git a/src/app/clusters/wifi-network-management-server/CodegenIntegration.h b/src/app/clusters/wifi-network-management-server/CodegenIntegration.h
new file mode 100644
index 00000000000..2d42fd65a44
--- /dev/null
+++ b/src/app/clusters/wifi-network-management-server/CodegenIntegration.h
@@ -0,0 +1,56 @@
+/**
+ *
+ *    Copyright (c) 2026 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/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h>
+#include <app/server-cluster/ServerClusterInterfaceRegistry.h>
+
+namespace chip::app::Clusters {
+
+/// Compatibility wrapper for WiFiNetworkManagementCluster for ZAP-based applications.
+///
+/// Note that this cluster does not support automatic instantiation of the cluster
+/// server even in ZAP-based applications; the application code is responsible for
+/// instantiating and registering the cluster manually.
+///
+/// @code
+/// std::optional<WiFiNetworkManagementServer> gServer;
+/// void emberAfWiFiNetworkManagementClusterInitCallback(EndpointId endpoint)
+/// {
+///     SuccessOrDie(gServer.emplace(endpoint).Init());
+/// }
+/// @endcode
+class WiFiNetworkManagementServer : public WiFiNetworkManagementCluster
+{
+public:
+    using WiFiNetworkManagementCluster::WiFiNetworkManagementCluster;
+
+    ~WiFiNetworkManagementServer();
+
+    /// Registers this cluster with the CodegenDataModelProvider.
+    CHIP_ERROR Init();
+
+    /// Unregisters this cluster from the CodegenDataModelProvider.
+    /// Unregistration happens automatically during destruction if necessary.
+    CHIP_ERROR Deinit(ClusterShutdownType clusterShutdownType = ClusterShutdownType::kClusterShutdown);
+
+private:
+    ServerClusterRegistration mRegistration{ *this };
+};
+
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.cpp b/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.cpp
index ac8004c90dd..279bd083d05 100644
--- a/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.cpp
+++ b/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.cpp
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2024 Project CHIP Authors
+ *    Copyright (c) 2024-2026 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,11 +17,15 @@
 
 #include "WiFiNetworkManagementCluster.h"
 
-#include <app/AttributeAccessInterfaceRegistry.h>
-#include <app/CommandHandlerInterfaceRegistry.h>
-#include <app/InteractionModelEngine.h>
-#include <app/reporting/reporting.h>
+#include <access/SubjectDescriptor.h>
+#include <app/CommandHandler.h>
+#include <app/server-cluster/AttributeListBuilder.h>
+#include <clusters/WiFiNetworkManagement/Attributes.h>
+#include <clusters/WiFiNetworkManagement/CommandIds.h>
+#include <clusters/WiFiNetworkManagement/Commands.h>
+#include <clusters/WiFiNetworkManagement/Metadata.h>
 #include <lib/support/CodeUtils.h>
+#include <protocols/interaction_model/StatusCode.h>
 #include <system/SystemClock.h>
 
 #include <algorithm>
@@ -30,13 +34,9 @@
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::WiFiNetworkManagement;
 using namespace chip::app::Clusters::WiFiNetworkManagement::Attributes;
 using namespace chip::app::Clusters::WiFiNetworkManagement::Commands;
-using IMStatus = chip::Protocols::InteractionModel::Status;
-
-namespace chip {
-namespace app {
-namespace Clusters {
 
 namespace {
 
@@ -57,52 +57,37 @@ bool IsValidWpaPersonalCredential(ByteSpan credential)
 
 } // namespace
 
-WiFiNetworkManagementServer::WiFiNetworkManagementServer(EndpointId endpoint) :
-    AttributeAccessInterface(MakeOptional(endpoint), WiFiNetworkManagement::Id),
-    CommandHandlerInterface(MakeOptional(endpoint), WiFiNetworkManagement::Id)
-{}
-
-WiFiNetworkManagementServer::~WiFiNetworkManagementServer()
-{
-    AttributeAccessInterfaceRegistry::Instance().Unregister(this);
-    TEMPORARY_RETURN_IGNORED CommandHandlerInterfaceRegistry::Instance().UnregisterCommandHandler(this);
-}
+namespace chip::app::Clusters {
 
-CHIP_ERROR WiFiNetworkManagementServer::Init()
+CHIP_ERROR WiFiNetworkManagementCluster::ClearNetworkCredentials()
 {
-    VerifyOrReturnError(AttributeAccessInterfaceRegistry::Instance().Register(this), CHIP_ERROR_INTERNAL);
-    ReturnErrorOnFailure(CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(this));
-    return CHIP_NO_ERROR;
-}
+    VerifyOrReturnError(HasNetworkCredentials(), CHIP_NO_ERROR);
 
-CHIP_ERROR WiFiNetworkManagementServer::ClearNetworkCredentials()
-{
-    VerifyOrReturnError(HaveNetworkCredentials(), CHIP_NO_ERROR);
+    mSsid.clear();
+    RETURN_SAFELY_IGNORED mPassphrase.SetLength(0);
 
-    mSsidLen = 0;
-    TEMPORARY_RETURN_IGNORED mPassphrase.SetLength(0);
-    MatterReportingAttributeChangeCallback(GetEndpointId(), WiFiNetworkManagement::Id, Ssid::Id);
+    NotifyAttributeChanged(Ssid::Id);
+    NotifyAttributeChanged(PassphraseSurrogate::Id);
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR WiFiNetworkManagementServer::SetNetworkCredentials(ByteSpan ssid, ByteSpan passphrase)
+CHIP_ERROR WiFiNetworkManagementCluster::SetNetworkCredentials(ByteSpan ssid, ByteSpan passphrase)
 {
-    VerifyOrReturnError(1 <= ssid.size() && ssid.size() <= sizeof(mSsid), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(1 <= ssid.size() && ssid.size() <= mSsid.capacity(), CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(IsValidWpaPersonalCredential(passphrase), CHIP_ERROR_INVALID_ARGUMENT);
 
-    bool ssidChanged       = !SsidSpan().data_equal(ssid);
-    bool passphraseChanged = !PassphraseSpan().data_equal(passphrase);
+    bool ssidChanged       = !Ssid().data_equal(ssid);
+    bool passphraseChanged = !Passphrase().data_equal(passphrase);
     VerifyOrReturnError(ssidChanged || passphraseChanged, CHIP_NO_ERROR);
 
-    memcpy(mSsid, ssid.data(), ssid.size());
-    mSsidLen = static_cast<decltype(mSsidLen)>(ssid.size());
+    mSsid.assign(ssid);
 
-    TEMPORARY_RETURN_IGNORED mPassphrase.SetLength(passphrase.size());
+    RETURN_SAFELY_IGNORED mPassphrase.SetLength(passphrase.size());
     memcpy(mPassphrase.Bytes(), passphrase.data(), passphrase.size());
 
     if (ssidChanged)
     {
-        MatterReportingAttributeChangeCallback(GetEndpointId(), WiFiNetworkManagement::Id, Ssid::Id);
+        NotifyAttributeChanged(Ssid::Id);
     }
     if (passphraseChanged)
     {
@@ -112,58 +97,74 @@ CHIP_ERROR WiFiNetworkManagementServer::SetNetworkCredentials(ByteSpan ssid, Byt
         {
             mPassphraseSurrogate = std::max(mPassphraseSurrogate, realtime.count());
         }
-        MatterReportingAttributeChangeCallback(GetEndpointId(), WiFiNetworkManagement::Id, PassphraseSurrogate::Id);
+        NotifyAttributeChanged(PassphraseSurrogate::Id);
     }
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR WiFiNetworkManagementServer::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+DataModel::ActionReturnStatus WiFiNetworkManagementCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                                          AttributeValueEncoder & encoder)
 {
-    switch (aPath.mAttributeId)
+    switch (request.path.mAttributeId)
     {
+    case FeatureMap::Id:
+        return encoder.Encode<uint32_t>(0);
+    case ClusterRevision::Id:
+        return encoder.Encode(WiFiNetworkManagement::kRevision);
     case Ssid::Id:
-        return HaveNetworkCredentials() ? aEncoder.Encode(SsidSpan()) : aEncoder.EncodeNull();
+        return HasNetworkCredentials() ? encoder.Encode(Ssid()) : encoder.EncodeNull();
     case PassphraseSurrogate::Id:
-        return HaveNetworkCredentials() ? aEncoder.Encode(mPassphraseSurrogate) : aEncoder.EncodeNull();
-    }
-    return CHIP_NO_ERROR;
-}
-
-void WiFiNetworkManagementServer::InvokeCommand(HandlerContext & ctx)
-{
-    switch (ctx.mRequestPath.mCommandId)
-    {
-    case NetworkPassphraseRequest::Id:
-        HandleCommand<NetworkPassphraseRequest::DecodableType>(
-            ctx, [this](HandlerContext & aCtx, const auto & req) { HandleNetworkPassphraseRequest(aCtx, req); });
-        return;
+        return HasNetworkCredentials() ? encoder.Encode(mPassphraseSurrogate) : encoder.EncodeNull();
+    default:
+        return Protocols::InteractionModel::Status::UnsupportedAttribute;
     }
 }
 
-void WiFiNetworkManagementServer::HandleNetworkPassphraseRequest(HandlerContext & ctx,
-                                                                 const NetworkPassphraseRequest::DecodableType & req)
+std::optional<DataModel::ActionReturnStatus> WiFiNetworkManagementCluster::InvokeCommand(const DataModel::InvokeRequest & request,
+                                                                                         TLV::TLVReader & input_arguments,
+                                                                                         CommandHandler * handler)
 {
-    if (ctx.mCommandHandler.GetSubjectDescriptor().authMode != Access::AuthMode::kCase)
+    switch (request.path.mCommandId)
     {
-        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, IMStatus::UnsupportedAccess);
-        return;
-    }
+    case NetworkPassphraseRequest::Id: {
+        VerifyOrReturnValue(request.subjectDescriptor->authMode == Access::AuthMode::kCase,
+                            Protocols::InteractionModel::Status::UnsupportedAccess);
+        VerifyOrReturnValue(HasNetworkCredentials(), Protocols::InteractionModel::Status::InvalidInState);
 
-    if (HaveNetworkCredentials())
-    {
         NetworkPassphraseResponse::Type response;
         response.passphrase = mPassphrase.Span();
-        ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
+        handler->AddResponse(request.path, response);
+        return std::nullopt;
     }
-    else
-    {
-        ctx.mCommandHandler.AddStatus(ctx.mRequestPath, IMStatus::InvalidInState);
+    default:
+        return Protocols::InteractionModel::Status::UnsupportedCommand;
     }
 }
 
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+CHIP_ERROR WiFiNetworkManagementCluster::Attributes(const ConcreteClusterPath & path,
+                                                    ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder)
+{
+    AttributeListBuilder listBuilder(builder);
+    return listBuilder.Append(Span<const DataModel::AttributeEntry>(WiFiNetworkManagement::Attributes::kMandatoryMetadata),
+                              Span<const AttributeListBuilder::OptionalAttributeEntry>());
+}
+
+CHIP_ERROR WiFiNetworkManagementCluster::AcceptedCommands(const ConcreteClusterPath & path,
+                                                          ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder)
+{
+    static constexpr DataModel::AcceptedCommandEntry kAcceptedCommands[] = {
+        WiFiNetworkManagement::Commands::NetworkPassphraseRequest::kMetadataEntry,
+    };
+    return builder.AppendElements(kAcceptedCommands);
+}
+
+CHIP_ERROR WiFiNetworkManagementCluster::GeneratedCommands(const ConcreteClusterPath & path,
+                                                           ReadOnlyBufferBuilder<CommandId> & builder)
+{
+    static constexpr CommandId kGeneratedCommands[] = {
+        WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id,
+    };
+    return builder.AppendElements(kGeneratedCommands);
+}
 
-void MatterWiFiNetworkManagementPluginServerInitCallback() {}
-void MatterWiFiNetworkManagementPluginServerShutdownCallback() {}
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h b/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h
index c538c585e74..30e8f2681ea 100644
--- a/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h
+++ b/src/app/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2024 Project CHIP Authors
+ *    Copyright (c) 2024-2026 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,53 +17,56 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-objects.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/CommandHandlerInterface.h>
+#include <app/server-cluster/DefaultServerCluster.h>
+#include <clusters/WiFiNetworkManagement/ClusterId.h>
+#include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
+#include <lib/support/FixedBuffer.h>
 #include <lib/support/Span.h>
 
-void emberAfWiFiNetworkManagementClusterServerInitCallback(chip::EndpointId);
+namespace chip::app::Clusters {
 
-namespace chip {
-namespace app {
-namespace Clusters {
-
-class WiFiNetworkManagementServer : private AttributeAccessInterface, private CommandHandlerInterface
+class WiFiNetworkManagementCluster : public DefaultServerCluster
 {
 public:
-    WiFiNetworkManagementServer(EndpointId endpoint);
-    ~WiFiNetworkManagementServer();
+    WiFiNetworkManagementCluster(EndpointId endpoint) : DefaultServerCluster({ endpoint, WiFiNetworkManagement::Id }) {}
 
-    CHIP_ERROR Init();
+    WiFiNetworkManagementCluster(WiFiNetworkManagementCluster const &)             = delete;
+    WiFiNetworkManagementCluster & operator=(WiFiNetworkManagementCluster const &) = delete;
 
-    CHIP_ERROR ClearNetworkCredentials();
+    /// Sets the Wi-Fi credentials to expose via this cluster.
+    /// The application is responsible for calling this method during startup,
+    /// and whenever the Wi-Fi credentials are modified externally.
     CHIP_ERROR SetNetworkCredentials(ByteSpan ssid, ByteSpan passphrase);
+    CHIP_ERROR ClearNetworkCredentials();
 
-    WiFiNetworkManagementServer(WiFiNetworkManagementServer const &)             = delete;
-    WiFiNetworkManagementServer & operator=(WiFiNetworkManagementServer const &) = delete;
+    /// Returns true if the cluster holds a valid SSID and Passphrase.
+    bool HasNetworkCredentials() const { return !mSsid.empty(); }
 
-private:
-    EndpointId GetEndpointId() { return AttributeAccessInterface::GetEndpointId().Value(); }
+    /// Returns the SSID of the Wi-Fi network managed by this cluster,
+    // or an empty span if no current network credentials are set.
+    ByteSpan Ssid() const { return mSsid.span(); }
 
-    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
-    void InvokeCommand(HandlerContext & handlerContext) override;
+    /// Returns the passphrase for the Wi-Fi network managed by this cluster,
+    // or an empty span if there are no current network credentials.
+    ByteSpan Passphrase() const { return mPassphrase.Span(); }
 
-    void HandleNetworkPassphraseRequest(HandlerContext & ctx,
-                                        const WiFiNetworkManagement::Commands::NetworkPassphraseRequest::DecodableType & req);
+    // ServerClusterInterface overrides
 
-    uint8_t mSsid[32];
-    uint8_t mSsidLen = 0;
-    static_assert(std::numeric_limits<decltype(mSsidLen)>::max() >= sizeof(mSsid));
-    ByteSpan SsidSpan() const { return ByteSpan(mSsid, mSsidLen); }
+    DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
+                                                AttributeValueEncoder & encoder) override;
+    std::optional<DataModel::ActionReturnStatus> InvokeCommand(const DataModel::InvokeRequest & request,
+                                                               TLV::TLVReader & input_arguments, CommandHandler * handler) override;
+    CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
+    CHIP_ERROR AcceptedCommands(const ConcreteClusterPath & path,
+                                ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder) override;
+    CHIP_ERROR GeneratedCommands(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<CommandId> & builder) override;
 
+private:
+    FixedByteBuffer<32, uint8_t> mSsid;
     uint64_t mPassphraseSurrogate = 0;
     Crypto::SensitiveDataBuffer<64> mPassphrase;
-    ByteSpan PassphraseSpan() const { return mPassphrase.Span(); }
-
-    bool HaveNetworkCredentials() { return mSsidLen > 0; }
 };
 
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+} // namespace chip::app::Clusters
diff --git a/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.cmake b/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.cmake
index a7bcd1bb5bf..a9842b2f433 100644
--- a/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2025 Project CHIP Authors
+# Copyright (c) 2025-2026 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.
@@ -12,10 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This is the equivalent to app_config_dependent_sources.gni
+# This block adds the codegen integration sources
+TARGET_SOURCES(
+  ${APP_TARGET}
+  PRIVATE
+    "${CLUSTER_DIR}/CodegenIntegration.cpp"
+    "${CLUSTER_DIR}/CodegenIntegration.h"
+    "${CLUSTER_DIR}/wifi-network-management-server.h"
+)
+
+# These are the things that BUILD.gn dependencies would pull
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/WiFiNetworkManagementCluster.cpp"
     "${CLUSTER_DIR}/WiFiNetworkManagementCluster.h"
-)
\ No newline at end of file
+)
diff --git a/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.gni b/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.gni
index dd27ab6423e..f04dcd30cfd 100644
--- a/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/wifi-network-management-server/app_config_dependent_sources.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2025 Project CHIP Authors
+# Copyright (c) 2025-2026 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.
@@ -11,7 +11,9 @@
 # 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.
+
 app_config_dependent_sources = [
-  "WiFiNetworkManagementCluster.cpp",
-  "WiFiNetworkManagementCluster.h",
+  "CodegenIntegration.cpp",
+  "CodegenIntegration.h",
+  "wifi-network-management-server.h",
 ]
diff --git a/src/app/clusters/wifi-network-management-server/tests/BUILD.gn b/src/app/clusters/wifi-network-management-server/tests/BUILD.gn
new file mode 100644
index 00000000000..bbab160db1b
--- /dev/null
+++ b/src/app/clusters/wifi-network-management-server/tests/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright (c) 2026 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/pigweed.gni")
+
+import("${chip_root}/build/chip/chip_test_suite.gni")
+
+chip_test_suite("tests") {
+  output_name = "libTestWiFiNetworkManagementCluster"
+
+  test_sources = [ "TestWiFiNetworkManagementCluster.cpp" ]
+
+  public_deps = [
+    "${chip_root}/src/app/clusters/wifi-network-management-server",
+    "${chip_root}/src/app/server-cluster/testing",
+    "${chip_root}/src/lib/support",
+  ]
+}
diff --git a/src/app/clusters/wifi-network-management-server/tests/TestWiFiNetworkManagementCluster.cpp b/src/app/clusters/wifi-network-management-server/tests/TestWiFiNetworkManagementCluster.cpp
new file mode 100644
index 00000000000..17051de3787
--- /dev/null
+++ b/src/app/clusters/wifi-network-management-server/tests/TestWiFiNetworkManagementCluster.cpp
@@ -0,0 +1,268 @@
+/*
+ *    Copyright (c) 2026 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/clusters/wifi-network-management-server/WiFiNetworkManagementCluster.h>
+#include <pw_unit_test/framework.h>
+
+#include <access/SubjectDescriptor.h>
+#include <app/server-cluster/testing/ClusterTester.h>
+#include <app/server-cluster/testing/ValidateGlobalAttributes.h>
+#include <clusters/WiFiNetworkManagement/Attributes.h>
+#include <clusters/WiFiNetworkManagement/Commands.h>
+#include <clusters/WiFiNetworkManagement/Metadata.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::WiFiNetworkManagement;
+using namespace chip::app::Clusters::WiFiNetworkManagement::Attributes;
+using namespace chip::Testing;
+
+namespace {
+
+struct TestWiFiNetworkManagementCluster : public ::testing::Test
+{
+    static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
+
+    static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
+
+    void SetUp() override { ASSERT_EQ(cluster.Startup(tester.GetServerClusterContext()), CHIP_NO_ERROR); }
+
+    void TearDown() override { cluster.Shutdown(ClusterShutdownType::kClusterShutdown); }
+
+    TestWiFiNetworkManagementCluster() : cluster(kTestEndpointId), tester(cluster) {}
+
+    static constexpr EndpointId kTestEndpointId = 1;
+
+    WiFiNetworkManagementCluster cluster;
+    ClusterTester tester;
+};
+
+} // namespace
+
+TEST_F(TestWiFiNetworkManagementCluster, AttributeListTest)
+{
+    ASSERT_TRUE(IsAttributesListEqualTo(cluster,
+                                        {
+                                            Ssid::kMetadataEntry,
+                                            PassphraseSurrogate::kMetadataEntry,
+                                        }));
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, ReadGlobalAttributesTest)
+{
+    uint16_t revision{};
+    ASSERT_EQ(tester.ReadAttribute(Globals::Attributes::ClusterRevision::Id, revision), CHIP_NO_ERROR);
+    EXPECT_EQ(revision, WiFiNetworkManagement::kRevision);
+
+    uint32_t features{};
+    ASSERT_EQ(tester.ReadAttribute(FeatureMap::Id, features), CHIP_NO_ERROR);
+    EXPECT_EQ(features, 0u);
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, InitialStateHasNoCredentials)
+{
+    EXPECT_FALSE(cluster.HasNetworkCredentials());
+    EXPECT_TRUE(cluster.Ssid().empty());
+    EXPECT_TRUE(cluster.Passphrase().empty());
+
+    DataModel::Nullable<ByteSpan> ssid;
+    ASSERT_EQ(tester.ReadAttribute(Ssid::Id, ssid), CHIP_NO_ERROR);
+    EXPECT_TRUE(ssid.IsNull());
+
+    DataModel::Nullable<uint64_t> passphraseSurrogate;
+    ASSERT_EQ(tester.ReadAttribute(PassphraseSurrogate::Id, passphraseSurrogate), CHIP_NO_ERROR);
+    EXPECT_TRUE(passphraseSurrogate.IsNull());
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, SetNetworkCredentials)
+{
+    const uint8_t ssidData[]       = { 'T', 'e', 's', 't', 'S', 'S', 'I', 'D' };
+    const uint8_t passphraseData[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '1', '2', '3' };
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData)), CHIP_NO_ERROR);
+
+    EXPECT_TRUE(cluster.HasNetworkCredentials());
+    EXPECT_TRUE(cluster.Ssid().data_equal(ByteSpan(ssidData)));
+    EXPECT_TRUE(cluster.Passphrase().data_equal(ByteSpan(passphraseData)));
+
+    DataModel::Nullable<ByteSpan> ssid;
+    ASSERT_EQ(tester.ReadAttribute(Ssid::Id, ssid), CHIP_NO_ERROR);
+    ASSERT_FALSE(ssid.IsNull());
+    EXPECT_TRUE(ssid.Value().data_equal(ByteSpan(ssidData)));
+
+    DataModel::Nullable<uint64_t> passphraseSurrogate;
+    ASSERT_EQ(tester.ReadAttribute(PassphraseSurrogate::Id, passphraseSurrogate), CHIP_NO_ERROR);
+    EXPECT_FALSE(passphraseSurrogate.IsNull());
+
+    // Both attributes should have been marked dirty
+    EXPECT_TRUE(tester.IsAttributeDirty(Ssid::Id));
+    EXPECT_TRUE(tester.IsAttributeDirty(PassphraseSurrogate::Id));
+
+    // Setting the same credentials again should not generate further notifications
+    tester.GetDirtyList().clear();
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData)), CHIP_NO_ERROR);
+    EXPECT_TRUE(tester.GetDirtyList().empty());
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, ClearNetworkCredentials)
+{
+    const uint8_t ssidData[]       = { 'T', 'e', 's', 't', 'S', 'S', 'I', 'D' };
+    const uint8_t passphraseData[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '1', '2', '3' };
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData)), CHIP_NO_ERROR);
+
+    // Verify credentials are set
+    DataModel::Nullable<ByteSpan> ssid;
+    ASSERT_EQ(tester.ReadAttribute(Ssid::Id, ssid), CHIP_NO_ERROR);
+    ASSERT_FALSE(ssid.IsNull());
+
+    // Clear credentials
+    tester.GetDirtyList().clear();
+    ASSERT_EQ(cluster.ClearNetworkCredentials(), CHIP_NO_ERROR);
+
+    EXPECT_FALSE(cluster.HasNetworkCredentials());
+    EXPECT_TRUE(cluster.Ssid().empty());
+    EXPECT_TRUE(cluster.Passphrase().empty());
+
+    // Verify credentials are cleared
+    ASSERT_EQ(tester.ReadAttribute(Ssid::Id, ssid), CHIP_NO_ERROR);
+    EXPECT_TRUE(ssid.IsNull());
+
+    DataModel::Nullable<uint64_t> passphraseSurrogate;
+    ASSERT_EQ(tester.ReadAttribute(PassphraseSurrogate::Id, passphraseSurrogate), CHIP_NO_ERROR);
+    EXPECT_TRUE(passphraseSurrogate.IsNull());
+
+    // Both attributes should have been marked dirty
+    EXPECT_TRUE(tester.IsAttributeDirty(Ssid::Id));
+    EXPECT_TRUE(tester.IsAttributeDirty(PassphraseSurrogate::Id));
+
+    // Clearing again when already cleared should not generate further notifications
+    tester.GetDirtyList().clear();
+    ASSERT_EQ(cluster.ClearNetworkCredentials(), CHIP_NO_ERROR);
+    EXPECT_TRUE(tester.GetDirtyList().empty());
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, SetNetworkCredentialsValidation)
+{
+    // SSID too short (empty)
+    const uint8_t validPassphrase[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd' };
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(), ByteSpan(validPassphrase)), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // SSID too long (> 32 bytes)
+    const uint8_t longSsid[33] = {};
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(longSsid), ByteSpan(validPassphrase)), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Passphrase too short (less than 8 characters)
+    const uint8_t ssidData[]      = { 'T', 'e', 's', 't' };
+    const uint8_t shortPassword[] = { 's', 'h', 'o', 'r', 't' };
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(shortPassword)), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Valid credentials should succeed
+    const uint8_t validPassword[] = { 'v', 'a', 'l', 'i', 'd', 'p', 'a', 's', 's' };
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(validPassword)), CHIP_NO_ERROR);
+
+    // Valid 64-byte hex PSK
+    const uint8_t validHexPsk[64] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+                                      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+                                      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+                                      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(validHexPsk)), CHIP_NO_ERROR);
+
+    // Invalid 64-byte non-hex PSK (contains 'G')
+    uint8_t invalidHexPsk[64];
+    std::fill(std::begin(invalidHexPsk), std::end(invalidHexPsk), uint8_t('G'));
+    EXPECT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(invalidHexPsk)), CHIP_ERROR_INVALID_ARGUMENT);
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, PassphraseSurrogateChangesOnPassphraseChange)
+{
+    const uint8_t ssidData[]        = { 'T', 'e', 's', 't', 'S', 'S', 'I', 'D' };
+    const uint8_t passphraseData1[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '1' };
+    const uint8_t passphraseData2[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '2' };
+
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData1)), CHIP_NO_ERROR);
+
+    DataModel::Nullable<uint64_t> surrogate1;
+    ASSERT_EQ(tester.ReadAttribute(PassphraseSurrogate::Id, surrogate1), CHIP_NO_ERROR);
+    ASSERT_FALSE(surrogate1.IsNull());
+
+    // Change passphrase, surrogate should change
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData2)), CHIP_NO_ERROR);
+
+    DataModel::Nullable<uint64_t> surrogate2;
+    ASSERT_EQ(tester.ReadAttribute(PassphraseSurrogate::Id, surrogate2), CHIP_NO_ERROR);
+    ASSERT_FALSE(surrogate2.IsNull());
+
+    EXPECT_NE(surrogate1.Value(), surrogate2.Value());
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, NetworkPassphraseRequestRequiresCaseSession)
+{
+    const uint8_t ssidData[]       = { 'T', 'e', 's', 't', 'S', 'S', 'I', 'D' };
+    const uint8_t passphraseData[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '1', '2', '3' };
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData)), CHIP_NO_ERROR);
+
+    // Test with non-CASE auth mode (e.g., PASE) - should be rejected
+    Access::SubjectDescriptor paseDescriptor;
+    paseDescriptor.authMode    = Access::AuthMode::kPase;
+    paseDescriptor.fabricIndex = 1;
+    tester.SetSubjectDescriptor(paseDescriptor);
+
+    Commands::NetworkPassphraseRequest::Type request;
+    auto result = tester.Invoke(request);
+
+    ASSERT_TRUE(result.status.has_value());
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+    EXPECT_EQ(result.status.value().GetStatusCode(),
+              Protocols::InteractionModel::ClusterStatusCode(Protocols::InteractionModel::Status::UnsupportedAccess));
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, NetworkPassphraseRequestRequiresCredentials)
+{
+    // Set up CASE session but don't set credentials
+    Access::SubjectDescriptor caseDescriptor;
+    caseDescriptor.authMode    = Access::AuthMode::kCase;
+    caseDescriptor.fabricIndex = 1;
+    tester.SetSubjectDescriptor(caseDescriptor);
+
+    Commands::NetworkPassphraseRequest::Type request;
+    auto result = tester.Invoke(request);
+
+    ASSERT_TRUE(result.status.has_value());
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+    EXPECT_EQ(result.status.value().GetStatusCode(),
+              Protocols::InteractionModel::ClusterStatusCode(Protocols::InteractionModel::Status::InvalidInState));
+}
+
+TEST_F(TestWiFiNetworkManagementCluster, NetworkPassphraseRequestSuccess)
+{
+    const uint8_t ssidData[]       = { 'T', 'e', 's', 't', 'S', 'S', 'I', 'D' };
+    const uint8_t passphraseData[] = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '1', '2', '3' };
+    ASSERT_EQ(cluster.SetNetworkCredentials(ByteSpan(ssidData), ByteSpan(passphraseData)), CHIP_NO_ERROR);
+
+    // Set up CASE session
+    Access::SubjectDescriptor caseDescriptor;
+    caseDescriptor.authMode    = Access::AuthMode::kCase;
+    caseDescriptor.fabricIndex = 1;
+    tester.SetSubjectDescriptor(caseDescriptor);
+
+    Commands::NetworkPassphraseRequest::Type request;
+    auto result = tester.Invoke(request);
+
+    ASSERT_TRUE(result.IsSuccess());
+    ASSERT_TRUE(result.response.has_value());
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+    EXPECT_TRUE(result.response.value().passphrase.data_equal(ByteSpan(passphraseData)));
+}
diff --git a/src/app/clusters/wifi-network-management-server/wifi-network-management-server.h b/src/app/clusters/wifi-network-management-server/wifi-network-management-server.h
new file mode 100644
index 00000000000..4606f16eca8
--- /dev/null
+++ b/src/app/clusters/wifi-network-management-server/wifi-network-management-server.h
@@ -0,0 +1,22 @@
+/**
+ *
+ *    Copyright (c) 2024-2026 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
+
+// Compatibility header - new code should include CodegenIntegration.h
+// (for ZAP-based applications) or WiFiNetworkManagementCluster.h.
+#include <app/clusters/wifi-network-management-server/CodegenIntegration.h>
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/WindowCoveringCluster.cpp
similarity index 100%
rename from src/app/clusters/window-covering-server/window-covering-server.cpp
rename to src/app/clusters/window-covering-server/WindowCoveringCluster.cpp
diff --git a/src/app/clusters/window-covering-server/app_config_dependent_sources.cmake b/src/app/clusters/window-covering-server/app_config_dependent_sources.cmake
index 2a95d9560c0..3f96d0b88a9 100644
--- a/src/app/clusters/window-covering-server/app_config_dependent_sources.cmake
+++ b/src/app/clusters/window-covering-server/app_config_dependent_sources.cmake
@@ -17,6 +17,6 @@ TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE
     "${CLUSTER_DIR}/window-covering-delegate.h"
-    "${CLUSTER_DIR}/window-covering-server.cpp"
+    "${CLUSTER_DIR}/WindowCoveringCluster.cpp"
     "${CLUSTER_DIR}/window-covering-server.h"
 )
\ No newline at end of file
diff --git a/src/app/clusters/window-covering-server/app_config_dependent_sources.gni b/src/app/clusters/window-covering-server/app_config_dependent_sources.gni
index 410f3b7320a..adca3475c69 100644
--- a/src/app/clusters/window-covering-server/app_config_dependent_sources.gni
+++ b/src/app/clusters/window-covering-server/app_config_dependent_sources.gni
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 app_config_dependent_sources = [
+  "WindowCoveringCluster.cpp",
   "window-covering-delegate.h",
-  "window-covering-server.cpp",
   "window-covering-server.h",
 ]
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 69d6ef4e006..0cffc38a327 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -57,7 +57,6 @@ CommandHandlerInterfaceOnlyClusters:
     - Water Heater Mode
     - WebRTC Transport Provider
     - WebRTC Transport Requestor
-    - Wi-Fi Network Management
     - Zone Management
     # keep-sorted end
 
@@ -149,6 +148,7 @@ CodeDrivenClusters:
     - Switch
     - TLS Certificate Management
     - TLS Client Management
+    - Temperature Measurement
     - Thread Network Diagnostics
     - Time Format Localization
     - Time Synchronization
@@ -156,4 +156,5 @@ CodeDrivenClusters:
     - User Label
     - Valve Configuration and Control
     - Wi-Fi Network Diagnostics
+    - Wi-Fi Network Management
     # keep-sorted end
diff --git a/src/app/icd/server/ICDMonitoringTable.cpp b/src/app/icd/server/ICDMonitoringTable.cpp
index 741c3b64ac4..357b5d3d750 100644
--- a/src/app/icd/server/ICDMonitoringTable.cpp
+++ b/src/app/icd/server/ICDMonitoringTable.cpp
@@ -178,15 +178,16 @@ bool ICDMonitoringEntry::IsKeyEquivalent(ByteSpan keyData)
     VerifyOrReturnValue(tempEntry.SetKey(keyData) == CHIP_NO_ERROR, false);
 
     // Challenge
-    uint8_t mic[Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES]  = { 0 };
-    uint8_t aead[Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES] = { 0 };
+    uint8_t mic[Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES]     = { 0 };
+    uint8_t nonce[Crypto::CHIP_CRYPTO_AEAD_NONCE_LENGTH_BYTES] = { 0 };
+    VerifyOrReturnValue(Crypto::DRBG_get_bytes(nonce, sizeof(nonce)) == CHIP_NO_ERROR, false);
 
     CHIP_ERROR err;
 
     uint64_t data = Crypto::GetRandU64(), validation, encrypted;
     validation    = data;
 
-    err = Crypto::AES_CCM_encrypt(reinterpret_cast<uint8_t *>(&data), sizeof(data), nullptr, 0, tempEntry.aesKeyHandle, aead,
+    err = Crypto::AES_CCM_encrypt(reinterpret_cast<uint8_t *>(&data), sizeof(data), nullptr, 0, tempEntry.aesKeyHandle, nonce,
                                   Crypto::CHIP_CRYPTO_AEAD_NONCE_LENGTH_BYTES, reinterpret_cast<uint8_t *>(&encrypted), mic,
                                   Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES);
 
@@ -194,7 +195,7 @@ bool ICDMonitoringEntry::IsKeyEquivalent(ByteSpan keyData)
     if (err == CHIP_NO_ERROR)
     {
         err = Crypto::AES_CCM_decrypt(reinterpret_cast<uint8_t *>(&encrypted), sizeof(encrypted), nullptr, 0, mic,
-                                      Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, aesKeyHandle, aead,
+                                      Crypto::CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, aesKeyHandle, nonce,
                                       Crypto::CHIP_CRYPTO_AEAD_NONCE_LENGTH_BYTES, reinterpret_cast<uint8_t *>(&data));
     }
     TEMPORARY_RETURN_IGNORED tempEntry.DeleteKey();
@@ -235,9 +236,7 @@ CHIP_ERROR ICDMonitoringTable::Get(uint16_t index, ICDMonitoringEntry & entry) c
 {
     entry.fabricIndex = this->mFabric;
     entry.index       = index;
-    ReturnErrorOnFailure(entry.Load(this->mStorage));
-    entry.fabricIndex = this->mFabric;
-    return CHIP_NO_ERROR;
+    return entry.Load(this->mStorage);
 }
 
 CHIP_ERROR ICDMonitoringTable::Find(NodeId id, ICDMonitoringEntry & entry)
diff --git a/src/app/server-cluster/DefaultServerCluster.cpp b/src/app/server-cluster/DefaultServerCluster.cpp
index 5016b17403f..69943cd271c 100644
--- a/src/app/server-cluster/DefaultServerCluster.cpp
+++ b/src/app/server-cluster/DefaultServerCluster.cpp
@@ -81,7 +81,19 @@ CHIP_ERROR DefaultServerCluster::Attributes(const ConcreteClusterPath & path, Re
 
 CHIP_ERROR DefaultServerCluster::Startup(ServerClusterContext & context)
 {
-    VerifyOrReturnError(mContext == nullptr, CHIP_ERROR_ALREADY_INITIALIZED);
+    // Reset shutdown state to allow restart after shutdown
+    mIsShutdown = false;
+
+    // Make Startup() idempotent for Stop() → Start() lifecycle.
+    // Shutdown() does not fully clean up cluster objects - cluster objects persist across Stop() → Start().
+    // Only their state (mContext) is cleared.
+    // If already initialized, update context and return success (preserves mDataVersion).
+    if (mContext != nullptr)
+    {
+        ChipLogDetail(DataManagement, "DefaultServerCluster::Startup() already initialized, updating context (idempotent)");
+        mContext = &context;
+        return CHIP_NO_ERROR;
+    }
 
     mContext = &context;
 
@@ -94,7 +106,14 @@ CHIP_ERROR DefaultServerCluster::Startup(ServerClusterContext & context)
 
 void DefaultServerCluster::Shutdown(ClusterShutdownType)
 {
-    mContext = nullptr;
+    // Make shutdown idempotent - safe to call multiple times
+    if (mIsShutdown)
+    {
+        return;
+    }
+
+    mContext    = nullptr;
+    mIsShutdown = true;
 }
 
 void DefaultServerCluster::NotifyAttributeChanged(AttributeId attributeId)
diff --git a/src/app/server-cluster/DefaultServerCluster.h b/src/app/server-cluster/DefaultServerCluster.h
index e0df0752d0e..62fce8284b5 100644
--- a/src/app/server-cluster/DefaultServerCluster.h
+++ b/src/app/server-cluster/DefaultServerCluster.h
@@ -106,6 +106,10 @@ class DefaultServerCluster : public ServerClusterInterface
 protected:
     const ConcreteClusterPath mPath;
     ServerClusterContext * mContext = nullptr;
+    // Tracks if shutdown has been called to make it idempotent
+    bool mIsShutdown = false;
+
+    bool IsStarted() const { return mContext != nullptr; }
 
     void IncreaseDataVersion() { mDataVersion++; }
 
diff --git a/src/app/server-cluster/ServerClusterInterfaceRegistry.cpp b/src/app/server-cluster/ServerClusterInterfaceRegistry.cpp
index b3967c4c95b..99cd59c934d 100644
--- a/src/app/server-cluster/ServerClusterInterfaceRegistry.cpp
+++ b/src/app/server-cluster/ServerClusterInterfaceRegistry.cpp
@@ -43,21 +43,58 @@ ServerClusterInterfaceRegistry::~ServerClusterInterfaceRegistry()
 
 CHIP_ERROR ServerClusterInterfaceRegistry::Register(ServerClusterRegistration & entry)
 {
-    // we have no strong way to check if entry is already registered somewhere else, so we use "next" as some
-    // form of double-check
-    VerifyOrReturnError(entry.next == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(entry.serverClusterInterface != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     Span<const ConcreteClusterPath> paths = entry.serverClusterInterface->GetPaths();
     VerifyOrReturnError(!paths.empty(), CHIP_ERROR_INVALID_ARGUMENT);
 
+    // Check early if this cluster is already registered (idempotent case)
+    // This prevents unnecessary validation work and ensures we don't modify the linked list structure
+    bool isAlreadyRegistered = false;
+    for (const ConcreteClusterPath & path : paths)
+    {
+        ServerClusterInterface * existing = Get(path);
+        if (existing == entry.serverClusterInterface)
+        {
+            isAlreadyRegistered = true;
+            break;
+        }
+    }
+
+    // Validate entry.next is nullptr (unless already registered)
+    // A non-null entry.next when not registered indicates the entry is
+    // already part of another list or improperly initialized
+    if (entry.next != nullptr && !isAlreadyRegistered)
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    // If already registered (idempotent case), return early
+    if (isAlreadyRegistered)
+    {
+#if CHIP_DETAIL_LOGGING
+        const ConcreteClusterPath path = entry.serverClusterInterface->GetPaths().front();
+        ChipLogDetail(DataManagement, "Cluster already registered for %u/" ChipLogFormatMEI ", skipping re-registration",
+                      path.mEndpointId, ChipLogValueMEI(path.mClusterId));
+#endif
+        return CHIP_NO_ERROR;
+    }
+
+    // Validate paths and check for duplicate registrations
+    // Note: Same cluster re-registering is OK (handled above), but a DIFFERENT
+    // cluster with the same endpoint/cluster ID is an error
+    // Duplicate checking makes this O(n^2) on total registered items. We preserve this to ensure
+    // cluster integrity during Stop/Start cycles, but this may be optimized in the future if needed.
     for (const ConcreteClusterPath & path : paths)
     {
         VerifyOrReturnError(path.HasValidIds(), CHIP_ERROR_INVALID_ARGUMENT);
 
-        // Double-checking for duplicates makes the checks O(n^2) on the total number of registered
-        // items. We preserve this however we may want to make this optional at some point in time.
-        VerifyOrReturnError(Get(path) == nullptr, CHIP_ERROR_DUPLICATE_KEY_ID);
+        // A different cluster is already registered for this path
+        ServerClusterInterface * existing = Get(path);
+        if (existing != nullptr)
+        {
+            return CHIP_ERROR_DUPLICATE_KEY_ID;
+        }
     }
 
     if (mContext.has_value())
diff --git a/src/app/server-cluster/ServerClusterInterfaceRegistry.h b/src/app/server-cluster/ServerClusterInterfaceRegistry.h
index 0afb908791b..44e3664ae5a 100644
--- a/src/app/server-cluster/ServerClusterInterfaceRegistry.h
+++ b/src/app/server-cluster/ServerClusterInterfaceRegistry.h
@@ -20,6 +20,7 @@
 #include <app/server-cluster/ServerClusterInterface.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 #include <cstdint>
 #include <new>
@@ -97,7 +98,14 @@ struct LazyRegisteredServerCluster
     template <typename... Args>
     void Create(Args &&... args)
     {
-        VerifyOrDie(!IsConstructed());
+        // Handle idempotent Create() - if already constructed, this is a no-op.
+        // The cluster remains registered and functional. This supports the Stop() → Start() lifecycle
+        // where clusters are shutdown but remain constructed.
+        if (IsConstructed())
+        {
+            ChipLogDetail(DataManagement, "LazyRegisteredServerCluster::Create: Cluster already constructed, skipping re-creation");
+            return;
+        }
 
         new (mCluster) SERVER_CLUSTER(std::forward<Args>(args)...);
         new (mRegistration) ServerClusterRegistration(Cluster());
diff --git a/src/app/server-cluster/testing/ClusterTester.h b/src/app/server-cluster/testing/ClusterTester.h
index 6b37d956ed9..9a7ecf4df80 100644
--- a/src/app/server-cluster/testing/ClusterTester.h
+++ b/src/app/server-cluster/testing/ClusterTester.h
@@ -317,6 +317,18 @@ class ClusterTester
 
     std::vector<app::AttributePathParams> & GetDirtyList() { return mTestServerClusterContext.ChangeListener().DirtyList(); }
 
+    // Returns true if the given attribute appears in the dirty list.
+    // Will construct the attribute path using the first path returned by `GetPaths()` on the cluster.
+    // Will VerifyOrDie that `GetPaths()` returns exactly one path.
+    bool IsAttributeDirty(AttributeId attributeId)
+    {
+        const auto & paths = mCluster.GetPaths();
+        VerifyOrDie(paths.size() == 1);
+        app::AttributePathParams target(paths[0].mEndpointId, paths[0].mClusterId, attributeId);
+        const auto & list = GetDirtyList();
+        return std::find(list.begin(), list.end(), target) != list.end();
+    }
+
     void SetFabricIndex(FabricIndex fabricIndex) { mHandler.SetFabricIndex(fabricIndex); }
     void SetSubjectDescriptor(const Access::SubjectDescriptor & subjectDescriptor)
     {
diff --git a/src/app/server-cluster/testing/TestProviderChangeListener.h b/src/app/server-cluster/testing/TestProviderChangeListener.h
index 3982b004bd3..9d046bdadd2 100644
--- a/src/app/server-cluster/testing/TestProviderChangeListener.h
+++ b/src/app/server-cluster/testing/TestProviderChangeListener.h
@@ -33,6 +33,24 @@ class TestProviderChangeListener : public app::DataModel::ProviderChangeListener
     std::vector<app::AttributePathParams> & DirtyList() { return mDirtyList; }
     const std::vector<app::AttributePathParams> & DirtyList() const { return mDirtyList; }
 
+    /**
+     * @brief Check if a specific attribute path is dirty.
+     *
+     * @param path The concrete attribute path to check
+     * @return true if the path is dirty, false otherwise
+     */
+    bool IsDirty(const app::ConcreteAttributePath & path) const
+    {
+        for (const auto & dirtyPath : mDirtyList)
+        {
+            if (dirtyPath.IsAttributePathSupersetOf(path))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
 private:
     std::vector<app::AttributePathParams> mDirtyList;
 };
diff --git a/src/app/server-cluster/tests/TestServerClusterInterfaceRegistry.cpp b/src/app/server-cluster/tests/TestServerClusterInterfaceRegistry.cpp
index 73aa2da906c..c22b63f3f77 100644
--- a/src/app/server-cluster/tests/TestServerClusterInterfaceRegistry.cpp
+++ b/src/app/server-cluster/tests/TestServerClusterInterfaceRegistry.cpp
@@ -335,7 +335,9 @@ TEST_F(TestServerClusterInterfaceRegistry, RegisterErrors)
 
     // Can't register a duplicate cluster
     EXPECT_EQ(registry.Register(registration1), CHIP_NO_ERROR);
-    EXPECT_EQ(registry.Register(registration1), CHIP_ERROR_DUPLICATE_KEY_ID);
+    // Idempotent: re-registering the same cluster object returns success
+    EXPECT_EQ(registry.Register(registration1), CHIP_NO_ERROR);
+    // Different cluster with same endpoint/cluster ID is still an error
     EXPECT_EQ(registry.Register(anotherRegistration1), CHIP_ERROR_DUPLICATE_KEY_ID);
 }
 
@@ -405,3 +407,46 @@ TEST_F(TestServerClusterInterfaceRegistry, StartupShutdownWithoutContext)
     EXPECT_EQ(cluster2.Cluster().GetShutdownCallCount(), 1u);
     EXPECT_EQ(cluster3.Cluster().GetShutdownCallCount(), 1u);
 }
+
+TEST_F(TestServerClusterInterfaceRegistry, WarmStartAfterShutdown)
+{
+    // This test validates app lifecycle management where apps need to:
+    // 1. Shutdown clusters when suspending/backgrounding (ClearContext)
+    // 2. Re-register and startup clusters when resuming/foregrounding
+    // The fix made Register() idempotent so re-registration succeeds without errors.
+    // This applies to any platform with app lifecycle (iOS, Android, tvOS, desktop, etc.)
+
+    RegisteredServerCluster<FakeServerClusterInterface> cluster1(kEp1, kCluster1);
+    RegisteredServerCluster<FakeServerClusterInterface> cluster2(kEp1, kCluster2);
+
+    ServerClusterInterfaceRegistry registry;
+    TestServerClusterContext context;
+
+    // COLD START: Initial registration and startup
+    EXPECT_EQ(registry.Register(cluster1.Registration()), CHIP_NO_ERROR);
+    EXPECT_EQ(registry.Register(cluster2.Registration()), CHIP_NO_ERROR);
+    EXPECT_EQ(registry.SetContext(ServerClusterContext{ context.Get() }), CHIP_NO_ERROR);
+
+    EXPECT_TRUE(cluster1.Cluster().HasContext());
+    EXPECT_TRUE(cluster2.Cluster().HasContext());
+
+    // BACKGROUND: Simulate app backgrounding - clear context (triggers Shutdown)
+    registry.ClearContext();
+    EXPECT_FALSE(cluster1.Cluster().HasContext());
+    EXPECT_FALSE(cluster2.Cluster().HasContext());
+
+    // WARM START: Re-register same clusters (should be idempotent - no errors)
+    EXPECT_EQ(registry.Register(cluster1.Registration()), CHIP_NO_ERROR);
+    EXPECT_EQ(registry.Register(cluster2.Registration()), CHIP_NO_ERROR);
+
+    // Set context again (triggers Startup)
+    EXPECT_EQ(registry.SetContext(ServerClusterContext{ context.Get() }), CHIP_NO_ERROR);
+
+    // Verify clusters are operational again
+    EXPECT_TRUE(cluster1.Cluster().HasContext());
+    EXPECT_TRUE(cluster2.Cluster().HasContext());
+
+    // Verify clusters are still accessible
+    EXPECT_EQ(registry.Get({ kEp1, kCluster1 }), &cluster1.Cluster());
+    EXPECT_EQ(registry.Get({ kEp1, kCluster2 }), &cluster2.Cluster());
+}
diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn
index e6ff77aa418..e5db0bd0743 100644
--- a/src/app/server/BUILD.gn
+++ b/src/app/server/BUILD.gn
@@ -58,6 +58,18 @@ source_set("joint_fabric") {
   ]
 }
 
+static_library("thread_rendezvous_announcement") {
+  sources = [
+    "ThreadRendezvousAnnouncement.cpp",
+    "ThreadRendezvousAnnouncement.h",
+  ]
+  deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/dnssd",
+    "${chip_root}/src/lib/dnssd/minimal_mdns",
+  ]
+}
+
 static_library("server") {
   output_name = "libCHIPAppServer"
 
@@ -76,8 +88,6 @@ static_library("server") {
     "EchoHandler.h",
     "Server.cpp",
     "Server.h",
-    "ThreadRendezvousAnnouncement.cpp",
-    "ThreadRendezvousAnnouncement.h",
   ]
 
   public_configs = [ ":server_config" ]
@@ -102,10 +112,7 @@ static_library("server") {
   ]
 
   if (chip_device_config_enable_thread_meshcop) {
-    public_deps += [
-      "${chip_root}/src/lib/dnssd/minimal_mdns",
-      "${chip_root}/src/lib/dnssd/minimal_mdns/records",
-    ]
+    deps = [ ":thread_rendezvous_announcement" ]
   }
 
   if (chip_terms_and_conditions_required) {
diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp
index 486ee9999b6..fd1c4f75963 100644
--- a/src/app/server/Dnssd.cpp
+++ b/src/app/server/Dnssd.cpp
@@ -41,12 +41,8 @@
 #include <algorithm>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
-#include <app/server/ThreadRendezvousAnnouncement.h>
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-
 #include <app/server/Server.h>
+#include <app/server/ThreadRendezvousAnnouncement.h> // nogncheck
 #endif
 
 using namespace chip;
diff --git a/src/app/server/JointFabricAdministrator.h b/src/app/server/JointFabricAdministrator.h
index efd907987ec..7f0b4ac3160 100644
--- a/src/app/server/JointFabricAdministrator.h
+++ b/src/app/server/JointFabricAdministrator.h
@@ -20,8 +20,11 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
+#include <lib/core/DataModelTypes.h>
 #include <lib/core/NodeId.h>
 
+#include <optional>
+
 namespace chip {
 namespace app {
 
@@ -48,6 +51,13 @@ class JointFabricAdministrator
         mPeerJFAdminClusterEndpointId = peerJFAdminClusterEndpointId;
     }
 
+    void SetVidVerificationForFabric(chip::FabricIndex fabricIndex) { mVidVerificationFabricIndex = fabricIndex; }
+    void ClearVidVerificationForFabric() { mVidVerificationFabricIndex.reset(); }
+    bool WasVidVerificationExecutedForFabric(chip::FabricIndex fabricIndex) const
+    {
+        return mVidVerificationFabricIndex.has_value() && (mVidVerificationFabricIndex.value() == fabricIndex);
+    }
+
     CHIP_ERROR SetDelegate(JointFabricAdministrator::Delegate * delegate)
     {
         VerifyOrReturnError(delegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -62,6 +72,7 @@ class JointFabricAdministrator
 
 private:
     chip::EndpointId mPeerJFAdminClusterEndpointId = chip::kInvalidEndpointId;
+    std::optional<chip::FabricIndex> mVidVerificationFabricIndex;
     JointFabricAdministrator::Delegate * mDelegate = nullptr;
 };
 
diff --git a/src/app/server/JointFabricDatastore.cpp b/src/app/server/JointFabricDatastore.cpp
index 3472d81b6eb..e6e5a16a203 100644
--- a/src/app/server/JointFabricDatastore.cpp
+++ b/src/app/server/JointFabricDatastore.cpp
@@ -23,6 +23,79 @@
 namespace chip {
 namespace app {
 
+void JointFabricDatastore::CopyGroupKeySetWithOwnedSpans(
+    const Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & source,
+    Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & destination)
+{
+    auto & storage = mGroupKeySetStorage[source.groupKeySetID];
+
+    destination.groupKeySetID           = source.groupKeySetID;
+    destination.groupKeySecurityPolicy  = source.groupKeySecurityPolicy;
+    destination.groupKeyMulticastPolicy = source.groupKeyMulticastPolicy;
+
+    CopyByteSpanWithOwnedStorage(source.epochKey0, storage.epochKey0, destination.epochKey0);
+    CopyByteSpanWithOwnedStorage(source.epochKey1, storage.epochKey1, destination.epochKey1);
+    CopyByteSpanWithOwnedStorage(source.epochKey2, storage.epochKey2, destination.epochKey2);
+
+    CopyNullableValue(source.epochStartTime0, destination.epochStartTime0);
+    CopyNullableValue(source.epochStartTime1, destination.epochStartTime1);
+    CopyNullableValue(source.epochStartTime2, destination.epochStartTime2);
+}
+
+void JointFabricDatastore::RemoveGroupKeySetStorage(uint16_t groupKeySetId)
+{
+    mGroupKeySetStorage.erase(groupKeySetId);
+}
+
+void JointFabricDatastore::SetGroupInformationFriendlyNameWithOwnedStorage(
+    GroupId groupId, const CharSpan & friendlyName,
+    Clusters::JointFabricDatastore::Structs::DatastoreGroupInformationEntryStruct::Type & destination)
+{
+    auto & storage = mGroupInformationStorage[groupId];
+    storage.friendlyName.assign(friendlyName.data(), friendlyName.data() + friendlyName.size());
+    destination.friendlyName = CharSpan(storage.friendlyName.data(), storage.friendlyName.size());
+}
+
+void JointFabricDatastore::RemoveGroupInformationStorage(GroupId groupId)
+{
+    mGroupInformationStorage.erase(groupId);
+}
+
+CHIP_ERROR JointFabricDatastore::SetAdminEntryWithOwnedStorage(
+    NodeId nodeId, const CharSpan & friendlyName, const ByteSpan & icac,
+    Clusters::JointFabricDatastore::Structs::DatastoreAdministratorInformationEntryStruct::Type & destination)
+{
+    auto & storage = mAdminEntryStorage[nodeId];
+
+    storage.friendlyName.assign(friendlyName.data(), friendlyName.data() + friendlyName.size());
+    destination.friendlyName = CharSpan(storage.friendlyName.data(), storage.friendlyName.size());
+
+    storage.icac.assign(icac.data(), icac.data() + icac.size());
+    destination.icac = ByteSpan(storage.icac.data(), storage.icac.size());
+
+    return CHIP_NO_ERROR;
+}
+
+void JointFabricDatastore::RemoveAdminEntryStorage(NodeId nodeId)
+{
+    mAdminEntryStorage.erase(nodeId);
+}
+
+void JointFabricDatastore::CopyByteSpanWithOwnedStorage(const DataModel::Nullable<ByteSpan> & source,
+                                                        std::vector<uint8_t> & storage, DataModel::Nullable<ByteSpan> & destination)
+{
+    if (!source.IsNull())
+    {
+        storage.assign(source.Value().data(), source.Value().data() + source.Value().size());
+        destination = ByteSpan(storage.data(), storage.size());
+    }
+    else
+    {
+        storage.clear();
+        destination.SetNull();
+    }
+}
+
 void JointFabricDatastore::AddListener(Listener & listener)
 {
     if (mListeners == nullptr)
@@ -540,24 +613,33 @@ CHIP_ERROR JointFabricDatastore::ContinueRefresh()
 
                         if (it == mGroupKeySetList.end())
                         {
-                            mGroupKeySetList.push_back(groupKeySet);
+                            Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type copiedKeySet;
+                            CopyGroupKeySetWithOwnedSpans(groupKeySet, copiedKeySet);
+                            mGroupKeySetList.push_back(copiedKeySet);
                         }
                         else
                         {
                             // Update existing entry
-                            *it = groupKeySet;
+                            CopyGroupKeySetWithOwnedSpans(groupKeySet, *it);
                         }
                     }
 
                     // Remove entries not in groupKeySets
-                    mGroupKeySetList.erase(std::remove_if(mGroupKeySetList.begin(), mGroupKeySetList.end(),
-                                                          [&](const auto & entry) {
-                                                              return !std::any_of(
-                                                                  groupKeySets.begin(), groupKeySets.end(), [&](const auto & gks) {
-                                                                      return entry.groupKeySetID == gks.groupKeySetID;
-                                                                  });
-                                                          }),
-                                           mGroupKeySetList.end());
+                    for (auto it = mGroupKeySetList.begin(); it != mGroupKeySetList.end();)
+                    {
+                        const bool existsOnNode = std::any_of(groupKeySets.begin(), groupKeySets.end(), [&](const auto & gks) {
+                            return it->groupKeySetID == gks.groupKeySetID;
+                        });
+                        if (!existsOnNode)
+                        {
+                            RemoveGroupKeySetStorage(it->groupKeySetID);
+                            it = mGroupKeySetList.erase(it);
+                        }
+                        else
+                        {
+                            ++it;
+                        }
+                    }
 
                     // Advance the state machine to process the group key sets.
                     mRefreshState = kRefreshingGroupKeySets;
@@ -859,12 +941,16 @@ CHIP_ERROR JointFabricDatastore::IsNodeIDInDatastore(NodeId nodeId, size_t & ind
 }
 
 CHIP_ERROR
-JointFabricDatastore::AddGroupKeySetEntry(Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & groupKeySet)
+JointFabricDatastore::AddGroupKeySetEntry(
+    const Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & groupKeySet)
 {
     VerifyOrReturnError(IsGroupKeySetEntryPresent(groupKeySet.groupKeySetID) == false, CHIP_IM_GLOBAL_STATUS(ConstraintError));
     VerifyOrReturnError(mGroupKeySetList.size() < kMaxGroupKeySet, CHIP_ERROR_NO_MEMORY);
 
-    mGroupKeySetList.push_back(groupKeySet);
+    Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type copiedKeySet;
+    CopyGroupKeySetWithOwnedSpans(groupKeySet, copiedKeySet);
+
+    mGroupKeySetList.push_back(copiedKeySet);
 
     return CHIP_NO_ERROR;
 }
@@ -890,6 +976,7 @@ CHIP_ERROR JointFabricDatastore::RemoveGroupKeySetEntry(uint16_t groupKeySetId)
     {
         if (it->groupKeySetID == groupKeySetId)
         {
+            RemoveGroupKeySetStorage(groupKeySetId);
             mGroupKeySetList.erase(it);
             return CHIP_NO_ERROR;
         }
@@ -914,7 +1001,7 @@ JointFabricDatastore::UpdateGroupKeySetEntry(
                                         Clusters::JointFabricDatastore::DatastoreGroupKeyMulticastPolicyEnum::kUnknownEnumValue,
                                 CHIP_IM_GLOBAL_STATUS(ConstraintError));
 
-            entry = groupKeySet;
+            CopyGroupKeySetWithOwnedSpans(groupKeySet, entry);
 
             return CHIP_NO_ERROR;
         }
@@ -930,6 +1017,8 @@ JointFabricDatastore::AddAdmin(
     VerifyOrReturnError(IsAdminEntryPresent(adminId.nodeID) == false, CHIP_IM_GLOBAL_STATUS(ConstraintError));
     VerifyOrReturnError(mAdminEntries.size() < kMaxAdminNodes, CHIP_ERROR_NO_MEMORY);
 
+    ReturnErrorOnFailure(SetAdminEntryWithOwnedStorage(adminId.nodeID, adminId.friendlyName, adminId.icac, adminId));
+
     mAdminEntries.push_back(adminId);
 
     return CHIP_NO_ERROR;
@@ -954,8 +1043,7 @@ CHIP_ERROR JointFabricDatastore::UpdateAdmin(NodeId nodeId, CharSpan friendlyNam
     {
         if (entry.nodeID == nodeId)
         {
-            entry.friendlyName = friendlyName;
-            entry.icac         = icac;
+            ReturnErrorOnFailure(SetAdminEntryWithOwnedStorage(nodeId, friendlyName, icac, entry));
             return CHIP_NO_ERROR;
         }
     }
@@ -970,6 +1058,7 @@ CHIP_ERROR JointFabricDatastore::RemoveAdmin(NodeId nodeId)
         if (it->nodeID == nodeId)
         {
             mAdminEntries.erase(it);
+            RemoveAdminEntryStorage(nodeId);
             return CHIP_NO_ERROR;
         }
     }
@@ -1049,11 +1138,11 @@ CHIP_ERROR JointFabricDatastore::AddGroup(const Clusters::JointFabricDatastore::
 
     Clusters::JointFabricDatastore::Structs::DatastoreGroupInformationEntryStruct::Type groupEntry;
     groupEntry.groupID         = commandData.groupID;
-    groupEntry.friendlyName    = commandData.friendlyName;
     groupEntry.groupKeySetID   = commandData.groupKeySetID;
     groupEntry.groupCAT        = commandData.groupCAT;
     groupEntry.groupCATVersion = commandData.groupCATVersion;
     groupEntry.groupPermission = commandData.groupPermission;
+    SetGroupInformationFriendlyNameWithOwnedStorage(commandData.groupID, commandData.friendlyName, groupEntry);
 
     // Add the group entry to the datastore
     mGroupInformationEntries.push_back(groupEntry);
@@ -1071,11 +1160,11 @@ JointFabricDatastore::ForceAddGroup(const Clusters::JointFabricDatastore::Comman
 
     Clusters::JointFabricDatastore::Structs::DatastoreGroupInformationEntryStruct::Type groupEntry;
     groupEntry.groupID         = commandData.groupID;
-    groupEntry.friendlyName    = commandData.friendlyName;
     groupEntry.groupKeySetID   = commandData.groupKeySetID;
     groupEntry.groupCAT        = commandData.groupCAT;
     groupEntry.groupCATVersion = commandData.groupCATVersion;
     groupEntry.groupPermission = commandData.groupPermission;
+    SetGroupInformationFriendlyNameWithOwnedStorage(commandData.groupID, commandData.friendlyName, groupEntry);
 
     // Add the group entry to the datastore
     mGroupInformationEntries.push_back(groupEntry);
@@ -1126,14 +1215,16 @@ JointFabricDatastore::UpdateGroup(const Clusters::JointFabricDatastore::Commands
 
                     if (syncErr != CHIP_NO_ERROR)
                     {
-                        ChipLogError(DataManagement, "Failed to sync node for group friendly name update, leaving as pending: %s",
-                                     ErrorStr(syncErr));
+                        ChipLogError(DataManagement,
+                                     "Failed to sync node for group friendly name update, leaving as pending: %" CHIP_ERROR_FORMAT,
+                                     syncErr.Format());
                     }
                 }
             }
 
             // Update the friendly name in the datastore
-            mGroupInformationEntries[index].friendlyName = commandData.friendlyName.Value();
+            SetGroupInformationFriendlyNameWithOwnedStorage(static_cast<GroupId>(mGroupInformationEntries[index].groupID),
+                                                            commandData.friendlyName.Value(), mGroupInformationEntries[index]);
         }
     }
     if (commandData.groupKeySetID.IsNull() == false)
@@ -1254,7 +1345,9 @@ JointFabricDatastore::RemoveGroup(const Clusters::JointFabricDatastore::Commands
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
 
+    const GroupId removedGroupId = static_cast<GroupId>(it->groupID);
     mGroupInformationEntries.erase(it);
+    RemoveGroupInformationStorage(removedGroupId);
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/app/server/JointFabricDatastore.h b/src/app/server/JointFabricDatastore.h
index 658299c7bd4..b5f96019253 100644
--- a/src/app/server/JointFabricDatastore.h
+++ b/src/app/server/JointFabricDatastore.h
@@ -25,6 +25,7 @@
 #include <lib/core/CHIPVendorIdentifiers.hpp>
 #include <lib/core/NodeId.h>
 #include <lib/support/ReadOnlyBuffer.h>
+#include <unordered_map>
 #include <vector>
 
 namespace chip {
@@ -323,7 +324,7 @@ class JointFabricDatastore
 
     CHIP_ERROR SetNode(NodeId nodeId, Clusters::JointFabricDatastore::DatastoreStateEnum state);
 
-    CHIP_ERROR AddGroupKeySetEntry(Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & groupKeySet);
+    CHIP_ERROR AddGroupKeySetEntry(const Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & groupKeySet);
     bool IsGroupKeySetEntryPresent(uint16_t groupKeySetId);
     CHIP_ERROR RemoveGroupKeySetEntry(uint16_t groupKeySetId);
     CHIP_ERROR UpdateGroupKeySetEntry(Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & groupKeySet);
@@ -411,6 +412,27 @@ class JointFabricDatastore
     }
 
 private:
+    struct GroupKeySetStorage
+    {
+        std::vector<uint8_t> epochKey0;
+        std::vector<uint8_t> epochKey1;
+        std::vector<uint8_t> epochKey2;
+    };
+
+    struct GroupInformationStorage
+    {
+        // Friendly names are surfaced as CharSpan and may come from non-null-terminated buffers.
+        // Keep raw owned bytes in vector<char> to preserve exact length semantics for Span use.
+        std::vector<char> friendlyName;
+    };
+
+    struct AdminEntryStorage
+    {
+        // Friendly names are stored as owned raw bytes for CharSpan (not C-string) semantics.
+        std::vector<char> friendlyName;
+        std::vector<uint8_t> icac;
+    };
+
     static constexpr size_t kMaxNodes            = 256;
     static constexpr size_t kMaxAdminNodes       = 32;
     static constexpr size_t kMaxGroups           = kMaxNodes / 16;
@@ -429,8 +451,11 @@ class JointFabricDatastore
     // TODO: Persist these members to local storage
     std::vector<GenericDatastoreNodeInformationEntry> mNodeInformationEntries;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type> mGroupKeySetList;
+    std::unordered_map<uint16_t, GroupKeySetStorage> mGroupKeySetStorage;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreAdministratorInformationEntryStruct::Type> mAdminEntries;
+    std::unordered_map<NodeId, AdminEntryStorage> mAdminEntryStorage;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreGroupInformationEntryStruct::Type> mGroupInformationEntries;
+    std::unordered_map<GroupId, GroupInformationStorage> mGroupInformationStorage;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreEndpointGroupIDEntryStruct::Type> mEndpointGroupIDEntries;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreEndpointBindingEntryStruct::Type> mEndpointBindingEntries;
     std::vector<Clusters::JointFabricDatastore::Structs::DatastoreNodeKeySetEntryStruct::Type> mNodeKeySetEntries;
@@ -464,6 +489,34 @@ class JointFabricDatastore
     CHIP_ERROR AddNodeKeySetEntry(GroupId groupId, uint16_t groupKeySetId);
     CHIP_ERROR RemoveNodeKeySetEntry(GroupId groupId, uint16_t groupKeySetId);
 
+    void CopyGroupKeySetWithOwnedSpans(const Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & source,
+                                       Clusters::JointFabricDatastore::Structs::DatastoreGroupKeySetStruct::Type & destination);
+    void RemoveGroupKeySetStorage(uint16_t groupKeySetId);
+
+    void SetGroupInformationFriendlyNameWithOwnedStorage(
+        GroupId groupId, const CharSpan & friendlyName,
+        Clusters::JointFabricDatastore::Structs::DatastoreGroupInformationEntryStruct::Type & destination);
+    void RemoveGroupInformationStorage(GroupId groupId);
+
+    CHIP_ERROR SetAdminEntryWithOwnedStorage(
+        NodeId nodeId, const CharSpan & friendlyName, const ByteSpan & icac,
+        Clusters::JointFabricDatastore::Structs::DatastoreAdministratorInformationEntryStruct::Type & destination);
+    void RemoveAdminEntryStorage(NodeId nodeId);
+
+    // Helper methods for copying optional ByteSpan and simple nullable values
+    void CopyByteSpanWithOwnedStorage(const DataModel::Nullable<ByteSpan> & source, std::vector<uint8_t> & storage,
+                                      DataModel::Nullable<ByteSpan> & destination);
+
+    template <typename T>
+    void CopyNullableValue(const DataModel::Nullable<T> & source, DataModel::Nullable<T> & destination)
+    {
+        // Only update destination if source has a value; leave destination unchanged if source is null.
+        if (!source.IsNull())
+        {
+            static_cast<void>(destination.Update(source));
+        }
+    }
+
     Delegate * mDelegate = nullptr;
 
     NodeId mRefreshingNodeId        = kUndefinedNodeId;
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index cdddd43d2c0..cc53727f0d1 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -790,6 +790,8 @@ void Server::RejoinExistingMulticastGroups()
 {
     ChipLogProgress(AppServer, "Joining Multicast groups");
     CHIP_ERROR err = CHIP_NO_ERROR;
+
+    bool groupcast_joined = false;
     for (const FabricInfo & fabric : mFabrics)
     {
         Credentials::GroupDataProvider::GroupInfo groupInfo;
@@ -800,8 +802,18 @@ void Server::RejoinExistingMulticastGroups()
             // GroupDataProvider was able to allocate rescources for an iterator
             while (iterator->Next(groupInfo))
             {
-                err = mTransports.MulticastGroupJoinLeave(
-                    Transport::PeerAddress::Multicast(fabric.GetFabricId(), groupInfo.group_id), true);
+                bool use_iana_addr = !groupInfo.UsePerGroupAddress();
+                if (use_iana_addr && groupcast_joined)
+                {
+                    // Already joined groupcast address
+                    continue;
+                }
+
+                const Transport::PeerAddress & address = use_iana_addr
+                    ? Transport::PeerAddress::Groupcast()
+                    : Transport::PeerAddress::Multicast(fabric.GetFabricId(), groupInfo.group_id);
+
+                err = mTransports.MulticastGroupJoinLeave(address, true);
                 if (err != CHIP_NO_ERROR)
                 {
                     ChipLogError(AppServer, "Error when trying to join Group %u of fabric index %u : %" CHIP_ERROR_FORMAT,
@@ -812,6 +824,8 @@ void Server::RejoinExistingMulticastGroups()
                     iterator->Release();
                     return;
                 }
+                if (use_iana_addr)
+                    groupcast_joined = true;
             }
 
             iterator->Release();
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index b5392c9a46e..9a98a5d4b99 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -551,8 +551,11 @@ class Server
                 return;
             }
 
-            if (mServer->GetTransportManager().MulticastGroupJoinLeave(
-                    Transport::PeerAddress::Multicast(fabric->GetFabricId(), new_group.group_id), true) != CHIP_NO_ERROR)
+            const Transport::PeerAddress & address = new_group.UsePerGroupAddress()
+                ? Transport::PeerAddress::Multicast(fabric->GetFabricId(), new_group.group_id)
+                : Transport::PeerAddress::Groupcast();
+
+            if (CHIP_NO_ERROR != mServer->GetTransportManager().MulticastGroupJoinLeave(address, true))
             {
                 ChipLogError(AppServer, "Unable to listen to group");
             }
@@ -560,15 +563,50 @@ class Server
 
         void OnGroupRemoved(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & old_group) override
         {
-            const FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
-            if (fabric == nullptr)
+            if (old_group.UsePerGroupAddress())
             {
-                ChipLogError(AppServer, "Group removed from nonexistent fabric?");
-                return;
+                // Per group address no longer in use, unsubscribe
+                const FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
+                if (fabric == nullptr)
+                {
+                    ChipLogError(AppServer, "Group removed from nonexistent fabric?");
+                    return;
+                }
+                const Transport::PeerAddress & address =
+                    Transport::PeerAddress::Multicast(fabric->GetFabricId(), old_group.group_id);
+                VerifyOrReturn(CHIP_NO_ERROR == mServer->GetTransportManager().MulticastGroupJoinLeave(address, false));
+            }
+            else
+            {
+                // Check if the address is still in use
+                Credentials::GroupDataProvider * provider = mServer->GetGroupDataProvider();
+                bool in_use                               = false;
+                if (nullptr != provider)
+                {
+                    // Check all groups from all fabrics
+                    Credentials::GroupDataProvider::GroupInfo group;
+                    for (const FabricInfo & fabric : mServer->GetFabricTable())
+                    {
+                        auto * iter = provider->IterateGroupInfo(fabric.GetFabricIndex());
+                        if (iter)
+                        {
+                            while (iter->Next(group) && !in_use)
+                            {
+                                in_use = !group.UsePerGroupAddress();
+                            }
+                        }
+                        iter->Release();
+                        if (in_use)
+                            break;
+                    }
+                }
+                if (!in_use)
+                {
+                    // Groupcast address no longer in use, unsubscribe
+                    const Transport::PeerAddress & address = Transport::PeerAddress::Groupcast();
+                    VerifyOrReturn(CHIP_NO_ERROR == mServer->GetTransportManager().MulticastGroupJoinLeave(address, false));
+                }
             }
-
-            TEMPORARY_RETURN_IGNORED mServer->GetTransportManager().MulticastGroupJoinLeave(
-                Transport::PeerAddress::Multicast(fabric->GetFabricId(), old_group.group_id), false);
         };
 
     private:
diff --git a/src/app/server/ThreadRendezvousAnnouncement.cpp b/src/app/server/ThreadRendezvousAnnouncement.cpp
index d2511021d45..5deb3fe468c 100644
--- a/src/app/server/ThreadRendezvousAnnouncement.cpp
+++ b/src/app/server/ThreadRendezvousAnnouncement.cpp
@@ -23,11 +23,9 @@
 
 #include <lib/support/CodeUtils.h>
 
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
-#include <lib/dnssd/minimal_mdns/ResponseBuilder.h> // nogncheck
-#include <lib/dnssd/minimal_mdns/records/Srv.h>     // nogncheck
-#include <lib/dnssd/minimal_mdns/records/Txt.h>     // nogncheck
-#endif
+#include <lib/dnssd/minimal_mdns/ResponseBuilder.h>
+#include <lib/dnssd/minimal_mdns/records/Srv.h>
+#include <lib/dnssd/minimal_mdns/records/Txt.h>
 
 namespace chip {
 namespace app {
@@ -113,7 +111,6 @@ CHIP_ERROR TxtStringsBuilder::FormatAndAdd(const char * format, ...)
     return CHIP_NO_ERROR;
 }
 
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
 CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingParameters & params,
                                              System::PacketBufferHandle & outBuffer)
 {
@@ -143,7 +140,6 @@ CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingP
 
     return CHIP_NO_ERROR;
 }
-#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
 
 } // namespace app
 } // namespace chip
diff --git a/src/app/server/ThreadRendezvousAnnouncement.h b/src/app/server/ThreadRendezvousAnnouncement.h
index eb48e3409a7..3d413437664 100644
--- a/src/app/server/ThreadRendezvousAnnouncement.h
+++ b/src/app/server/ThreadRendezvousAnnouncement.h
@@ -58,8 +58,6 @@ class TxtStringsBuilder
     const char * mTxtStrings[Dnssd::CommissionAdvertisingParameters::kTxtMaxNumber];
 };
 
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
-
 /**
  * @brief Builds the Thread Rendezvous Announcement packet buffer.
  *
@@ -70,7 +68,5 @@ class TxtStringsBuilder
 CHIP_ERROR BuildThreadRendezvousAnnouncement(const Dnssd::CommissionAdvertisingParameters & params,
                                              System::PacketBufferHandle & outBuffer);
 
-#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP
-
 } // namespace app
 } // namespace chip
diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp
index 7aff4328e87..be8bd2eb83d 100644
--- a/src/app/server/java/AndroidAppServerWrapper.cpp
+++ b/src/app/server/java/AndroidAppServerWrapper.cpp
@@ -66,14 +66,14 @@ CHIP_ERROR ChipAndroidAppInit(AppDelegate * appDelegate)
     initParams.portRetryCount = 9;
 #endif
 
-    err = chip::Server::GetInstance().Init(initParams);
-    SuccessOrExit(err);
-
     if (!IsDeviceAttestationCredentialsProviderSet())
     {
         SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     }
 
+    err = chip::Server::GetInstance().Init(initParams);
+    SuccessOrExit(err);
+
 exit:
     if (err != CHIP_NO_ERROR)
     {
diff --git a/src/app/server/tests/BUILD.gn b/src/app/server/tests/BUILD.gn
index 47c50776d65..2828ae88740 100644
--- a/src/app/server/tests/BUILD.gn
+++ b/src/app/server/tests/BUILD.gn
@@ -30,6 +30,7 @@ chip_test_suite("tests") {
   public_deps = [
     "${chip_root}/src/app/server",
     "${chip_root}/src/app/server:joint_fabric",
+    "${chip_root}/src/app/server:thread_rendezvous_announcement",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support:testing",
   ]
diff --git a/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp b/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp
index 4d41c4d113d..9e16865c0ce 100644
--- a/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp
+++ b/src/app/server/tests/TestThreadRendezvousAnnouncement.cpp
@@ -45,17 +45,6 @@ TEST_F(TestThreadRendezvousAnnouncement, TxtStringsBuilder)
 
     TxtStringsBuilder builder;
     EXPECT_EQ(builder.Fill(params), CHIP_NO_ERROR);
-
-    // Expected entries:
-    // VP=123+456
-    // D=789
-    // CM=1
-    // DT=1
-    // DN=TestDevice
-    // RI=1234567890
-    // PH=2
-    // PI=Press button
-
     EXPECT_EQ(builder.GetCount(), 8u);
     const char * const * entries = builder.GetEntries();
 
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
index 903b8af17c3..fb16ff124b4 100644
--- a/src/app/tests/BUILD.gn
+++ b/src/app/tests/BUILD.gn
@@ -83,7 +83,7 @@ source_set("time-sync-data-provider-test-srcs") {
 
 source_set("power-cluster-test-srcs") {
   sources = [
-    "${chip_root}/src/app/clusters/power-source-server/power-source-server.cpp",
+    "${chip_root}/src/app/clusters/power-source-server/CodegenIntegration.cpp",
   ]
 
   public_deps = [
@@ -95,8 +95,10 @@ source_set("power-cluster-test-srcs") {
 }
 
 source_set("actions-cluster-test-srcs") {
-  sources =
-      [ "${chip_root}/src/app/clusters/actions-server/actions-server.cpp" ]
+  sources = [
+    "${chip_root}/src/app/clusters/actions-server/ActionsCluster.cpp",
+    "${chip_root}/src/app/clusters/actions-server/actions-server.h",
+  ]
 
   public_deps = [
     "${chip_root}/src/app/common:cluster-objects",
@@ -216,8 +218,8 @@ source_set("app-test-stubs") {
 
 source_set("closure-control-test-srcs") {
   sources = [
+    "${chip_root}/src/app/clusters/closure-control-server/ClosureControlClusterLogic.cpp",
     "${chip_root}/src/app/clusters/closure-control-server/closure-control-cluster-delegate.h",
-    "${chip_root}/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp",
     "${chip_root}/src/app/clusters/closure-control-server/closure-control-cluster-logic.h",
     "${chip_root}/src/app/clusters/closure-control-server/closure-control-cluster-matter-context.h",
     "${chip_root}/src/app/clusters/closure-control-server/closure-control-cluster-objects.h",
@@ -241,7 +243,6 @@ chip_test_suite("tests") {
     "TestAclAttribute.cpp",
     "TestAclCommand.cpp",
     "TestAclEvent.cpp",
-    "TestActionsCluster.cpp",
     "TestAttributeAccessInterfaceCache.cpp",
     "TestAttributePathExpandIterator.cpp",
     "TestAttributePathParams.cpp",
@@ -321,6 +322,7 @@ chip_test_suite("tests") {
 
   if (chip_device_platform != "android") {
     test_sources += [
+      "TestActionsCluster.cpp",
       "TestCertificateTableImpl.cpp",
       "TestExtensionFieldSets.cpp",
       "TestSceneTable.cpp",
diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml
index 58c329380cc..221c3bfea80 100644
--- a/src/app/tests/suites/TestBasicInformation.yaml
+++ b/src/app/tests/suites/TestBasicInformation.yaml
@@ -173,8 +173,8 @@ tests:
       attribute: "SpecificationVersion"
       minRevision: 3
       response:
-          # For now all-clusters-app has a version 1.5
-          value: 0x01050100
+          # For now all-clusters-app has a version 1.6
+          value: 0x01060000
 
     - label: "Read the Max Paths Per Invoke value"
       command: "readAttribute"
diff --git a/src/app/tests/suites/TestDescriptorCluster.yaml b/src/app/tests/suites/TestDescriptorCluster.yaml
index 49b78bb1cfa..5734b36672b 100644
--- a/src/app/tests/suites/TestDescriptorCluster.yaml
+++ b/src/app/tests/suites/TestDescriptorCluster.yaml
@@ -33,7 +33,7 @@ tests:
       attribute: "DeviceTypeList"
       response:
           value:
-              [{ DeviceType: 17, Revision: 1 }, { DeviceType: 22, Revision: 3 }]
+              [{ DeviceType: 17, Revision: 1 }, { DeviceType: 22, Revision: 5 }]
 
     - label: "Read attribute Server list"
       command: "readAttribute"
@@ -66,6 +66,7 @@ tests:
                       0x003F, # Group Key Management
                       0x0040, # Fixed Label
                       0x0041, # User Label
+                      0x0065, # Groupcast
                       0x0405, # Relative Humidity Measurement (why on EP0?)
                       0xFFF1FC06, # Fault Injection
                   ]
diff --git a/src/app/tests/suites/TestGroupDemoConfig.yaml b/src/app/tests/suites/TestGroupDemoConfig.yaml
index 284eb1686d9..4bfab4028d4 100644
--- a/src/app/tests/suites/TestGroupDemoConfig.yaml
+++ b/src/app/tests/suites/TestGroupDemoConfig.yaml
@@ -56,6 +56,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Write Group Keys (endpoint 0)"
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
index 9f0ffef450b..ba717d3c8fe 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -110,7 +110,7 @@ tests:
           saveAs: ClusterRevisionValue
           constraints:
               minValue: 1
-              maxValue: 2
+              maxValue: 3
               type: int16u
 
     - label: "Creates a new variable to hold if the cluster revision is == 2"
@@ -143,6 +143,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -162,6 +163,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -182,6 +184,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -204,6 +207,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -226,6 +230,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -247,6 +252,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -266,6 +272,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -288,6 +295,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -310,6 +318,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -331,6 +340,7 @@ tests:
                         EpochStartTime1: 1,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -352,6 +362,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -371,6 +382,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: null,
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -393,6 +405,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -415,6 +428,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -436,6 +450,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 100,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -456,6 +471,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2 CacheAndSync"
@@ -474,6 +490,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2 TrustFirst"
@@ -492,6 +509,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 3 CacheAndSync"
@@ -513,6 +531,7 @@ tests:
                         EpochKey2:
                             "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 3 TrustFirst"
@@ -534,6 +553,7 @@ tests:
                         EpochKey2:
                             "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 4"
@@ -554,6 +574,7 @@ tests:
                         EpochKey2:
                             "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Read"
@@ -575,6 +596,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: null,
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Read All Indices"
@@ -586,7 +608,10 @@ tests:
                     # Note: There's always an IPK keyset with index 0
                     contains: [0x01a1, 0x01a2, 0]
 
-    - label: "Write one keyset too many when already full"
+    # TODO: This is really hardcoded based on the default value of CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC.
+    # Logic should be added to handle configurations variability.
+    # To do so, this whole test should be moved to python tests for better flexibility.
+    - label: "Write additional KeySets to reach fabric 1 capacity"
       command: "KeySetWrite"
       arguments:
           values:
@@ -601,6 +626,25 @@ tests:
                         EpochStartTime1: 3110001,
                         EpochKey2: "\xf1\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 3110002,
+                        GroupKeyMulticastPolicy: 0,
+                    }
+
+    - label: "Write one keyset too many when already full"
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value:
+                    {
+                        GroupKeySetID: 0x0333,
+                        GroupKeySecurityPolicy: 0,
+                        EpochKey0: "\xd1\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
+                        EpochStartTime0: 3110000,
+                        EpochKey1: "\xe1\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef",
+                        EpochStartTime1: 3110001,
+                        EpochKey2: "\xf1\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+                        EpochStartTime2: 3110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: RESOURCE_EXHAUSTED
@@ -1332,6 +1376,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: null,
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Read (not removed) TrustFirst"
@@ -1354,6 +1399,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: null,
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Remove Group 1"
@@ -1439,6 +1485,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2 CacheAndSync"
@@ -1457,6 +1504,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2 TrustFirst"
@@ -1475,6 +1523,7 @@ tests:
                         EpochStartTime1: 2110001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Map Group 1 and Group 2 to KeySet 1 and group 2 to KeySet 2"
diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml
index 2655237fdda..856b29bb210 100644
--- a/src/app/tests/suites/TestGroupMessaging.yaml
+++ b/src/app/tests/suites/TestGroupMessaging.yaml
@@ -62,6 +62,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2"
@@ -79,6 +80,7 @@ tests:
                         EpochStartTime1: 2220001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2220002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Write Group Keys"
@@ -366,6 +368,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "KeySet Write 2 for gamma"
@@ -384,6 +387,7 @@ tests:
                         EpochStartTime1: 2220001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2220002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Write Group Keys for gamma"
diff --git a/src/app/tests/suites/TestGroupsCluster.yaml b/src/app/tests/suites/TestGroupsCluster.yaml
index 9b93aaeea29..d9f2fb32f63 100644
--- a/src/app/tests/suites/TestGroupsCluster.yaml
+++ b/src/app/tests/suites/TestGroupsCluster.yaml
@@ -86,6 +86,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Write Group Keys"
diff --git a/src/app/tests/suites/TestScenesFabricRemoval.yaml b/src/app/tests/suites/TestScenesFabricRemoval.yaml
index f5934beafdd..cdb65161db4 100644
--- a/src/app/tests/suites/TestScenesFabricRemoval.yaml
+++ b/src/app/tests/suites/TestScenesFabricRemoval.yaml
@@ -132,6 +132,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "TH1 Map KeySets to GroupId."
@@ -176,6 +177,7 @@ tests:
                         EpochStartTime1: 1120001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1120002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH2 Map KeySets to GroupId."
diff --git a/src/app/tests/suites/TestScenesFabricSceneInfo.yaml b/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
index b69d5d3c864..a2c22f1e039 100644
--- a/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
+++ b/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
@@ -125,6 +125,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step for using the Write Group Keys command."
diff --git a/src/app/tests/suites/TestScenesMaxCapacity.yaml b/src/app/tests/suites/TestScenesMaxCapacity.yaml
index baadeb50f3f..32ff7dab239 100644
--- a/src/app/tests/suites/TestScenesMaxCapacity.yaml
+++ b/src/app/tests/suites/TestScenesMaxCapacity.yaml
@@ -267,6 +267,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH1 Map KeySets to GroupId."
@@ -335,6 +336,7 @@ tests:
                         EpochStartTime1: 1120001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1120002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH2 Map KeySets to GroupId."
@@ -418,6 +420,7 @@ tests:
                         EpochStartTime1: 1120001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1120002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH3 Map KeySets to GroupId."
diff --git a/src/app/tests/suites/TestScenesMultiFabric.yaml b/src/app/tests/suites/TestScenesMultiFabric.yaml
index 8dd154f1cb4..7ab48cce9d3 100644
--- a/src/app/tests/suites/TestScenesMultiFabric.yaml
+++ b/src/app/tests/suites/TestScenesMultiFabric.yaml
@@ -203,6 +203,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH1 Map KeySets to GroupId."
@@ -271,6 +272,7 @@ tests:
                         EpochStartTime1: 1120001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1120002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label: "Preparation step TH1 Map KeySets to GroupId."
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index b3b0d10b189..a131557d5a9 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -344,6 +344,23 @@ PICS:
     - label: "Does the device implement Fabric Synchronization capabilities?"
       id: MCORE.FS
 
+    #
+    # Joint Fabric Administrator
+    #
+
+    - label:
+          "Does the device implement Joint Fabric Administrator cluster as
+          server?"
+      id: JFPKI.S
+
+    - label:
+          "Does the device implement Joint Fabric Administrator cluster as
+          client?"
+      id: JFPKI.C
+
+    - label: "Does the device implement AdministratorFabricIndex attribute?"
+      id: JFPKI.S.A0000
+
     #
     #IDM
     #
@@ -5260,6 +5277,12 @@ PICS:
           PhysicalContactUnoccupiedToOccupiedThreshold attribute?"
       id: OCC.S.A0032
 
+    #
+    # server / Events
+    #
+    - label: "Does the device implement the OccupancyChanged event?"
+      id: OCC.S.E00
+
     #
     # server / manually
     #
@@ -6080,6 +6103,9 @@ PICS:
     - label: "Does the device implement the ExpiryDate attribute?"
       id: SMOKECO.S.A000c
 
+    - label: "Does the device implement the Unmounted attribute?"
+      id: SMOKECO.S.A000d
+
     #
     # server / Events
     #
@@ -6129,6 +6155,9 @@ PICS:
           device?"
       id: SMOKECO.M.ManuallyControlledMute
 
+    - label: "Is the device inoperative when it is unmounted?"
+      id: SMOKECO.M.InoperativeWhenUnmounted
+
     #
     # server / commandsReceived
     #
@@ -6544,6 +6573,21 @@ PICS:
           "Does the device implement the SetpointHoldExpiryTimestamp attribute?"
       id: TSTAT.S.A0052
 
+    - label: "Does the device implement the MaxThermostatSuggestions attribute?"
+      id: TSTAT.S.A0053
+
+    - label: "Does the device implement the ThermostatSuggestions attribute?"
+      id: TSTAT.S.A0054
+
+    - label:
+          "Does the device implement the CurrentThermostatSuggestion attribute?"
+      id: TSTAT.S.A0055
+
+    - label:
+          "Does the device implement the ThermostatSuggestionNotFollowingReason
+          attribute?"
+      id: TSTAT.S.A0056
+
     #
     # server / commandsReceived
     #
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 9738fefb702..4fa047bc1d6 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
@@ -57,7 +57,8 @@ tests:
           GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2:
-          d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002"
+          d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002
+          GroupKeyMulticastPolicy: 0"
       cluster: "Group Key Management"
       command: "KeySetWrite"
       arguments:
@@ -73,6 +74,7 @@ tests:
                         EpochStartTime1: 2220001,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 2220002,
+                        GroupKeyMulticastPolicy: 0,
                     }
     - label:
           "Step 1b: TH sends KeySetWrite command in the GroupKeyManagement
@@ -81,7 +83,8 @@ tests:
           GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
           a0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1:
           b1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2:
-          c2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002"
+          c2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002
+          GroupKeyMulticastPolicy: 0"
       cluster: "Group Key Management"
       command: "KeySetWrite"
       arguments:
@@ -97,6 +100,7 @@ tests:
                         EpochStartTime1: 2220001,
                         EpochKey2: "hex:c2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 2220002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
index d0f2e302907..4b63e0c51cb 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
@@ -93,7 +93,8 @@ tests:
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 74 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002,
+          "groupKeyMulticastPolicy": 0}' 74 0
 
           On TH1(Chip-tool), Verify the success response for KeySetWrite
 
@@ -134,7 +135,8 @@ tests:
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002,
+          "groupKeyMulticastPolicy": 0}' 2 0
 
           On TH1(Chip-tool), Verify the success response for KeySetWrite
 
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
index 9c5167aa46c..09088e6aece 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
@@ -92,7 +92,8 @@ tests:
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 74 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002,
+          "groupKeyMulticastPolicy": 0}' 74 0
 
           On TH1(Chip-tool), Verify the success response for KeySetWrite
 
@@ -128,7 +129,7 @@ tests:
 
           Run this command for lighting app in chip-tool:
 
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42, "groupKeySecurityPolicy": 0, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42, "groupKeySecurityPolicy": 0, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002, "groupKeyMulticastPolicy": 0 }' 2 0
 
           On TH1, Verify the success response for KeySetWrite
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_22.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_22.yaml
new file mode 100644
index 00000000000..92b4bb522b9
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_22.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2026 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: 3.3.22. [TC-DD-3.22] NFC-based commissioning [DUT as Commissioner]
+
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.SCAN_NFC
+    - MCORE.DD.NTL
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic Information"
+    endpoint: 0
+
+tests:
+    - label:
+          "Step 1: Power up the TH Device and put the TH Device in commissioning
+          mode"
+      verification: |
+          1. Power up the TH device.
+          2. Put the TH device into commissioning mode as per the device-specific procedure.
+          3. Verify that the TH device indicates it is in commissioning mode
+             (e.g., via LED pattern, display, or log output).
+      disabled: true
+
+    - label: "Step 2: Bring the DUT close to the NFC tag for the TH Device"
+      verification: |
+          1. Bring and hold the DUT close to the NFC tag on the TH Device.
+          2. Verify on the DUT that onboarding information is read via NFC and a
+             commissioning flow is initiated.
+          3. Complete any on-screen/on-UI prompts on the DUT to finish commissioning.
+          4. Check on the TH Device that commissioning is completed successfully
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GRPKEY_2_2.yaml b/src/app/tests/suites/certification/Test_TC_GRPKEY_2_2.yaml
index 6397b87906b..5e83fd6d0a7 100644
--- a/src/app/tests/suites/certification/Test_TC_GRPKEY_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_GRPKEY_2_2.yaml
@@ -49,7 +49,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2:18446744073709551614"
+          8)EpochStartTime2:18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -65,6 +65,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -89,6 +90,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: null,
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -97,7 +99,7 @@ tests:
           follows:1)GroupKeySetID: 0x01a 2) GroupKeySecurityPolicy: TrustFirst
           (0) 3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: null 6)EpochStartTime1:null 7)EpochKey2: null
-          8)EpochStartTime2:null"
+          8)EpochStartTime2:null 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -113,6 +115,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -122,7 +125,7 @@ tests:
           (0) 3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf
           6)EpochStartTime1:18446744073709551613 7)EpochKey2: null
-          8)EpochStartTime2:null"
+          8)EpochStartTime2:null 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -138,6 +141,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: null,
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -147,7 +151,7 @@ tests:
           4)EpochStartTime0: 1 5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf
           6)EpochStartTime1:18446744073709551613 7)EpochKey2:
           d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2:18446744073709551614"
+          8)EpochStartTime2:18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -163,6 +167,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -174,7 +179,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: null
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 18446744073709551614"
+          8)EpochStartTime2: 18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -190,6 +195,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -201,7 +207,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 0
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2:18446744073709551614"
+          8)EpochStartTime2:18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -217,6 +223,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -228,7 +235,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: null 6)EpochStartTime1: 18446744073709551613 7)EpochKey2:
           d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2:18446744073709551614"
+          8)EpochStartTime2:18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -244,6 +251,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -255,7 +263,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1: null
           7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2:18446744073709551614"
+          8)EpochStartTime2:18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -271,6 +279,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -282,7 +291,7 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0:
           18446744073709551613 5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf
           6)EpochStartTime1: 1 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 18446744073709551614"
+          8)EpochStartTime2: 18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -298,6 +307,7 @@ tests:
                         EpochStartTime1: 1,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -309,8 +319,9 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: null 6)EpochStartTime1: null 7)EpochKey2:
           d2d1d2d3d4d5d6d7d8d9dadbdcdddedf 8)EpochStartTime2:
-          18446744073709551614 Note: EpochKey1 and EpochStartTime1 are null when
-          EpochKey2 and EpochStartTime2 are not null"
+          18446744073709551614 9)GroupKeyMulticastPolicy: 0 Note: EpochKey1 and
+          EpochStartTime1 are null when EpochKey2 and EpochStartTime2 are not
+          null "
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -326,6 +337,7 @@ tests:
                         EpochStartTime1: null,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -337,8 +349,8 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: null 8)EpochStartTime2:
-          18446744073709551614 Note: EpochKey2 is set to null and
-          EpochStartTime2 is not null"
+          18446744073709551614 9)GroupKeyMulticastPolicy: 0 Note: EpochKey2 is
+          set to null and EpochStartTime2 is not null"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -354,6 +366,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: null,
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -365,8 +378,8 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: null Note: EpochKey2 is not null and
-          EpochStartTime2 is null"
+          8)EpochStartTime2: null 9)GroupKeyMulticastPolicy: 0 Note: EpochKey2
+          is not null and EpochStartTime2 is null"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -382,6 +395,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: null,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -393,8 +407,8 @@ tests:
           3)EpochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           6)EpochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 7)EpochStartTime1:
           18446744073709551613 8)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          9)EpochStartTime2: 1 Note: EpochStartTime2 is earlier than
-          EpochStartTime1"
+          9)EpochStartTime2: 1 10)GroupKeyMulticastPolicy: 0 Note:
+          EpochStartTime2 is earlier than EpochStartTime1"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -410,6 +424,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: INVALID_COMMAND
@@ -421,8 +436,8 @@ tests:
           3)EpochKey0: d0 4)EpochStartTime0: 1 5)EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 1 Note1: Repeat the step by sending EpochKey1 and
-          EpochKey2 with 1 byte value (< 16 bytes)"
+          8)EpochStartTime2: 1 9)GroupKeyMulticastPolicy: 0 Note1: Repeat the
+          step by sending EpochKey1 and EpochKey2 with 1 byte value (< 16 bytes)"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -438,6 +453,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -460,6 +476,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -482,6 +499,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -506,6 +524,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -528,6 +547,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -550,6 +570,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcddde",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -574,6 +595,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -596,6 +618,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -618,6 +641,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedfde",
                         EpochStartTime2: 1,
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: CONSTRAINT_ERROR
@@ -629,9 +653,9 @@ tests:
           3)EpochKey0: d3d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1
           5)EpochKey1: d4d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           17446744073709551613 7)EpochKey2: d5d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 17446744073709551614 Note: KeySetWrite command is
-          sent with different EpochKeys,EpochStartTime1 and EpochStartTime2
-          values"
+          8)EpochStartTime2: 17446744073709551614 9)GroupKeyMulticastPolicy: 0
+          Note: KeySetWrite command is sent with different
+          EpochKeys,EpochStartTime1 and EpochStartTime2 values"
       PICS: GRPKEY.S.C00.Rsp
       command: "KeySetWrite"
       arguments:
@@ -647,6 +671,7 @@ tests:
                         EpochStartTime1: "17446744073709551613",
                         EpochKey2: "hex:d5d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "17446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -671,6 +696,7 @@ tests:
                         EpochStartTime1: "17446744073709551613",
                         EpochKey2: null,
                         EpochStartTime2: "17446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -702,7 +728,7 @@ tests:
           TH’s fabric in GroupKeyMap attribute contains Max_GrpKey entries,
           starting with GroupKeySetID 1 and incrementing by 1 each time."
       verification: |
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify DUT sends SUCCESS(0x00) response on TH(chip-tool)  Logs:
 
@@ -736,7 +762,7 @@ tests:
           [1692341708.963328][8072:8074] CHIP:DMG:         InteractionModelRevision = 1
           [1692341708.963333][8072:8074] CHIP:DMG: },
 
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 2,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 2,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify DUT sends SUCCESS(0x00) response on TH(chip-tool)  Logs:
 
@@ -797,6 +823,7 @@ tests:
                         EpochStartTime1: "18446744073709551613",
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: "18446744073709551614",
+                        GroupKeyMulticastPolicy: 0,
                     }
       response:
           error: RESOURCE_EXHAUSTED
diff --git a/src/app/tests/suites/certification/Test_TC_GRPKEY_5_4.yaml b/src/app/tests/suites/certification/Test_TC_GRPKEY_5_4.yaml
index fff517643af..cbbf8327ab0 100644
--- a/src/app/tests/suites/certification/Test_TC_GRPKEY_5_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_GRPKEY_5_4.yaml
@@ -35,10 +35,10 @@ tests:
           CacheAndSync (1) epochKey0: d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
           epochStartTime0: 1 epochKey1: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf
           epochStartTime1: 2220001 epochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          epochStartTime2: 2220002"
+          epochStartTime2: 2220002 groupKeyMulticastPolicy: 0"
       PICS: "!GRPKEY.S.F00 && GRPKEY.S.C00.Rsp "
       verification: |
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a3", "groupKeySecurityPolicy": 1, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1, "epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a3", "groupKeySecurityPolicy": 1, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1, "epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify DUT sends INVALID_COMMAND response on  TH(chip-tool)  Logs:
 
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
index 090d7a30be8..b29a1c64530 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
@@ -51,9 +51,9 @@ tests:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 1 EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 18446744073709551613
           EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2:
-          18446744073709551614"
+          18446744073709551614 GroupKeyMulticastPolicy: 0"
       verification: |
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614, "groupKeyMulticastPolicy": 0}' 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_G_2_4.yaml b/src/app/tests/suites/certification/Test_TC_G_2_4.yaml
index 25f85829ac3..2d7f975fbef 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_4.yaml
@@ -66,7 +66,7 @@ tests:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1 5)EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 18446744073709551614"
+          8)EpochStartTime2: 18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       cluster: "Group Key Management"
       command: "KeySetWrite"
@@ -83,6 +83,7 @@ tests:
                         EpochStartTime1: 18446744073709551613,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 18446744073709551614,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
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 bbafb43b272..a1a3a052c9b 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
@@ -52,7 +52,7 @@ tests:
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002, "groupKeyMulticastPolicy": 0}' 1 0
 
           Verify the KeySetWrite attribute On TH (all-Clusters-app) log and below is the sample log provided for the raspi platform:
 
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml
index 6ba8806b5f5..702feb90a2c 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml
@@ -55,6 +55,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml
index 6e551bbfca5..28b455da0b6 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml
@@ -55,6 +55,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
index aa4d7044479..d8266f8d5e4 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
@@ -84,7 +84,8 @@ tests:
           2)GroupKeySecurityPolicy: TrustFirst (0) 3)EpochKey0:
           00000000000000000000000000000001 4)EpochStartTime0: 111 5)EpochKey1:
           00000000000000000000000000000002 6)EpochStartTime1: 222 7)EpochKey2:
-          00000000000000000000000000000003 8)EpochStartTime2: 333"
+          00000000000000000000000000000003 8)EpochStartTime2: 333
+          9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       cluster: "Group Key Management"
       command: "KeySetWrite"
@@ -101,6 +102,7 @@ tests:
                         EpochStartTime1: 222,
                         EpochKey2: "hex:00000000000000000000000000000003",
                         EpochStartTime2: 333,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -111,7 +113,7 @@ tests:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 1 5)EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 18446744073709551614"
+          8)EpochStartTime2: 18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       cluster: "Group Key Management"
       command: "KeySetWrite"
@@ -128,6 +130,7 @@ tests:
                         EpochStartTime1: 18446744073709551613,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 18446744073709551614,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -223,6 +226,7 @@ tests:
                         EpochStartTime1: 18446744073709551613,
                         EpochKey2: null,
                         EpochStartTime2: 18446744073709551614,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
index b558b0b9111..459e082a47e 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
@@ -81,7 +81,7 @@ tests:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0:1 5)EpochKey1:
           d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1:
           18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf
-          8)EpochStartTime2: 18446744073709551614"
+          8)EpochStartTime2: 18446744073709551614 9)GroupKeyMulticastPolicy: 0"
       PICS: GRPKEY.S.C00.Rsp
       cluster: "Group Key Management"
       command: "KeySetWrite"
@@ -98,6 +98,7 @@ tests:
                         EpochStartTime1: 18446744073709551613,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
                         EpochStartTime2: 18446744073709551614,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml
index a508ccefc14..86c8e0e1d28 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml
@@ -166,7 +166,7 @@ tests:
           to TH on EP0"
       PICS: GRPKEY.C.C00.Tx
       verification: |
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 419,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 419,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify that  KeySetWrite command on TH(Reference app)log:
 
diff --git a/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
index 98cf2a39efb..70db92fb2c8 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
@@ -123,7 +123,8 @@ tests:
           Sample epoch key values that will be used in the forthcomming steps:
           "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002,
+          "groupKeyMulticastPolicy": 0
           Sample Group Name: Grp1
           GroupKeySetID: 42
           GroupID = 1
@@ -138,7 +139,8 @@ tests:
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002,
+          "groupKeyMulticastPolicy": 0}' 1 0
 
           Verify TH recieves KeySetWrite command on TH(Reference app)log:
 
diff --git a/src/app/tests/suites/certification/Test_TC_SMOKECO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SMOKECO_2_1.yaml
index 27010e8b59d..0a8ef2814d4 100644
--- a/src/app/tests/suites/certification/Test_TC_SMOKECO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SMOKECO_2_1.yaml
@@ -39,7 +39,7 @@ tests:
           constraints:
               type: enum8
               minValue: 0
-              maxValue: 8
+              maxValue: 9
 
     - label: "Step 3: TH reads from the DUT the SmokeState attribute"
       PICS: SMOKECO.S.A0001
@@ -156,3 +156,11 @@ tests:
       response:
           constraints:
               type: epoch_s
+
+    - label: "Step 15: TH reads from the DUT the Unmounted attribute"
+      PICS: SMOKECO.S.A000d
+      command: "readAttribute"
+      attribute: "Unmounted"
+      response:
+          constraints:
+              type: boolean
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
new file mode 100644
index 00000000000..981b8634246
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
@@ -0,0 +1,255 @@
+# 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: 3.5.1. [TC-SU-2.7] Verifying Events on OTA-R(DUT)
+
+PICS:
+    - MCORE.OTA.Requestor
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic Information"
+    endpoint: 0
+
+tests:
+    - label: "Step 1: Perform a software update on the DUT."
+      verification: |
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+
+          ./chip-tool interactive start
+
+          Subscribe to StateTransition event using command
+
+          otasoftwareupdaterequestor subscribe-event state-transition 5 10 321 0
+
+          Verify that the OTA-Subscriber(TH) receives the SateTransition event notification for the state changes like Querying,Downloading,Applying,Idle(Optional).
+
+
+          [1673513950.693526][6070:6073] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002A Event 0x0000_0000
+          [1673513950.693585][6070:6073] CHIP:TOO:   Event number: 65539
+          [1673513950.693687][6070:6073] CHIP:TOO:   Priority: Info
+          [1673513950.693733][6070:6073] CHIP:TOO:   Timestamp: 92662821
+          [1673513950.693907][6070:6073] CHIP:TOO:   StateTransition: {
+          [1673513950.693982][6070:6073] CHIP:TOO:     PreviousState: 5
+          [1673513950.694036][6070:6073] CHIP:TOO:     NewState: 1
+          [1673513950.694088][6070:6073] CHIP:TOO:     Reason: 1
+          [1673513950.694142][6070:6073] CHIP:TOO:     TargetSoftwareVersion: null
+          [1673513950.694258][6070:6073] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Step 2: DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P
+          sends a QueryImageResponse back to DUT. QueryStatus is set to 'Busy'."
+      verification: |
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+          ./chip-tool interactive start
+
+          Subscribe to StateTransition event using command
+          otasoftwareupdaterequestor subscribe-event state-transition 5 10 321 0
+
+          Verify that the OTA-Subscriber receives(TH) a StateTransition event notification for the state change to DelayedOnQuery.
+
+          [1673514130.748245][6097:6099] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002A Event 0x0000_0000
+          [1673514130.748304][6097:6099] CHIP:TOO:   Event number: 3
+          [1673514130.748349][6097:6099] CHIP:TOO:   Priority: Info
+          [1673514130.748394][6097:6099] CHIP:TOO:   Timestamp: 97644124
+          [1673514130.748640][6097:6099] CHIP:TOO:   StateTransition: {
+          [1673514130.748720][6097:6099] CHIP:TOO:     PreviousState: 1
+          [1673514130.748778][6097:6099] CHIP:TOO:     NewState: 2
+          [1673514130.748832][6097:6099] CHIP:TOO:     Reason: 1
+          [1673514130.748887][6097:6099] CHIP:TOO:     TargetSoftwareVersion: null
+          [1673514130.748940][6097:6099] CHIP:TOO:    }
+          [1673514130.749175][6097:6099] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002A Event 0x0000_0000
+          [1673514130.749233][6097:6099] CHIP:TOO:   Event number: 4
+          [1673514130.749278][6097:6099] CHIP:TOO:   Priority: Info
+          [1673514130.749324][6097:6099] CHIP:TOO:   Timestamp: 97644362
+          [1673514130.749389][6097:6099] CHIP:TOO:   StateTransition: {
+          [1673514130.749446][6097:6099] CHIP:TOO:     PreviousState: 2
+          [1673514130.749500][6097:6099] CHIP:TOO:     NewState: 3
+          [1673514130.749551][6097:6099] CHIP:TOO:     Reason: 4
+          [1673514130.749603][6097:6099] CHIP:TOO:     TargetSoftwareVersion: null
+          [1673514130.749658][6097:6099] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Step 3: DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P does
+          not respond back to DUT."
+      verification: |
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+          ./chip-tool interactive start
+
+          Subscribe to StateTransition event using command
+          otasoftwareupdaterequestor subscribe-event state-transition 5 10 321 0
+
+          Kill OTA Provider App before issuing query using
+
+          Verify that the OTA-Subscriber receives(TH) a StateTransition event notification for the state change to Idle.
+          [1673515600.737159][6193:6195] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002A Event 0x0000_0000
+          [1673515600.737213][6193:6195] CHIP:TOO:   Event number: 6
+          [1673515600.737258][6193:6195] CHIP:TOO:   Priority: Info
+          [1673515600.737303][6193:6195] CHIP:TOO:   Timestamp: 99077244
+          [1673515600.737367][6193:6195] CHIP:TOO:   StateTransition: {
+          [1673515600.737421][6193:6195] CHIP:TOO:     PreviousState: 4
+          [1673515600.737473][6193:6195] CHIP:TOO:     NewState: 1
+          [1673515600.737523][6193:6195] CHIP:TOO:     Reason: 3
+          [1673515600.737575][6193:6195] CHIP:TOO:     TargetSoftwareVersion: null
+          [1673515600.737626][6193:6195] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Step 4: DUT sends a QueryImage command to the TH/OTA-P.
+          RequestorCanConsent is set to True by DUT. OTA-P/TH responds with a
+          QueryImageResponse with UserConsentNeeded field set to True."
+      PICS: MCORE.OTA.RequestorConsent
+      verification: |
+          Run the Provider App using
+          ./chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -c
+
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+          ./chip-tool interactive start
+
+          Subscribe to StateTransition event using command
+          otasoftwareupdaterequestor subscribe-event state-transition 5 10 321 0
+
+          Verify that the OTA-Subscriber receives a StateTransition event notification for the state change to DelayedOnUserConsent.
+      disabled: true
+
+    - label:
+          "Step 5: Force an error during the download of the OTA image to the
+          DUT. Wait for the Idle timeout which should be no less than 5 minutes."
+      verification: |
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+          ./chip-tool interactive start
+
+          Force an error during the download of the OTA image to the DUT. Wait for the Idle timeout which should be no less than 5 minutes.
+
+          otasoftwareupdaterequestor subscribe-event download-error 5 10 321 0 --timeout 65535
+
+          Verify that the OTA-Subscribe(TH) receives a DownloadError event notification on BDX Idle timeout which should be no less than 5 minutes
+          Verify following fields:
+           - SoftwareVersion - Set to the value of the SoftwareVersion being downloaded.
+           - BytesDownloaded - Number of bytes that have been downloaded.
+           - ProgressPercent - Nearest Integer percent value reflecting how far within the transfer the failure occurred. IF the total length of the transfer is unknown, the value can be NULL.
+           - PlatformCode - Internal product-specific error code or NULL.
+
+          [1651520178426] [98732:38086919] CHIP: [TOO]   DownloadError: {
+          [1651520178426] [98732:38086919] CHIP: [TOO]     SoftwareVersion: 2
+          [1651520178426] [98732:38086919] CHIP: [TOO]     BytesDownloaded: 2995
+          [1651520178426] [98732:38086919] CHIP: [TOO]     ProgressPercent: 65
+          [1651520178426] [98732:38086919] CHIP: [TOO]     PlatformCode: null
+          [1651520178426] [98732:38086919] CHIP: [TOO]    }
+
+          otasoftwareupdaterequestor subscribe-event-by-id 0 30 60 321 0
+
+          Verify that the OTA-Subscribe(TH) receives a StateTransition event notification for the state change to Idle.
+
+          [1654558704063] [57765:69159905] CHIP: [TOO]   StateTransition: {
+          [1654558704064] [57765:69159905] CHIP: [TOO]     PreviousState: 4
+          [1654558704064] [57765:69159905] CHIP: [TOO]     NewState: 1
+          [1654558704064] [57765:69159905] CHIP: [TOO]     Reason: 3
+          [1654558704064] [57765:69159905] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1654558704064] [57765:69159905] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "Step 6: After the OTA image is transferred, DUT sends
+          ApplyUpdateRequest to the OTA-P. OTA-P/TH sends the
+          ApplyUpdateResponse Command to the DUT. Action field is set to
+          'AwaitNextAction'."
+      verification: |
+          ./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
+
+          Please use Interactive mode to Verify the subscription of an event
+          ./chip-tool interactive start
+
+          Subscribe to StateTransition event using command
+          otasoftwareupdaterequestor subscribe-event state-transition 5 10 321 0
+
+          Verify that the OTA-Subscriber(TH) receives the SateTransition event notification for the state change to DelayedOnApply
+
+          [1651283503471] [29332:35530821] CHIP: [TOO]   StateTransition: {
+          [1651283503471] [29332:35530821] CHIP: [TOO]     PreviousState: 1
+          [1651283503471] [29332:35530821] CHIP: [TOO]     NewState: 2
+          [1651283503471] [29332:35530821] CHIP: [TOO]     Reason: 1
+          [1651283503471] [29332:35530821] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651283503471] [29332:35530821] CHIP: [TOO]    }
+
+          [1651283503471] [29332:35530821] CHIP: [TOO]   StateTransition: {
+          [1651283503471] [29332:35530821] CHIP: [TOO]     PreviousState: 2
+          [1651283503471] [29332:35530821] CHIP: [TOO]     NewState: 4
+          [1651283503471] [29332:35530821] CHIP: [TOO]     Reason: 1
+          [1651283503471] [29332:35530821] CHIP: [TOO]     TargetSoftwareVersion: 2
+          [1651283503471] [29332:35530821] CHIP: [TOO]    }
+
+          [1651283513475] [29332:35531053] CHIP: [TOO]   StateTransition: {
+          [1651283513475] [29332:35531053] CHIP: [TOO]     PreviousState: 4
+          [1651283513475] [29332:35531053] CHIP: [TOO]     NewState: 5
+          [1651283513475] [29332:35531053] CHIP: [TOO]     Reason: 1
+          [1651283513475] [29332:35531053] CHIP: [TOO]     TargetSoftwareVersion: 2
+          [1651283513475] [29332:35531053] CHIP: [TOO]    }
+
+          [1651283513475] [29332:35531053] CHIP: [TOO]   StateTransition: {
+          [1651283513475] [29332:35531053] CHIP: [TOO]     PreviousState: 5
+          [1651283513475] [29332:35531053] CHIP: [TOO]     NewState: 6
+          [1651283513475] [29332:35531053] CHIP: [TOO]     Reason: 4
+          [1651283513475] [29332:35531053] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651283513475] [29332:35531053] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "Step 7: DUT successfully finishes applying a software update, and the
+          new software image version is being executed on the DUT.
+          OTA-Subscriber sends a read request to read the VersionApplied event
+          from the DUT."
+      verification: |
+          ./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
+
+          Read VersionApplied event once the DUT successfully finishes applying a software update .
+
+          ./chip-tool otasoftwareupdaterequestor read-event version-applied 321 0
+
+          Verify TH receives VersionApplied event with following fields:
+          - SoftwareVersion - Same as the one available in the SoftwareVersion attribute of the Basic Information Cluster for the newly executing version.
+          -  ProductID - Same as what is available in the ProductID attribute of the Basic Information Cluster.
+
+          [1645818271254] [21222:21170014] CHIP: [TOO]   VersionApplied: {
+          [1645818271254] [21222:21170014] CHIP: [TOO]     SoftwareVersion: 2
+          [1645818271254] [21222:21170014] CHIP: [TOO]     ProductID: 32769
+          [1645818271254] [21222:21170014] CHIP: [TOO]    }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
index c1c0a24bd8b..7e98b83f2e5 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -83,6 +83,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
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 99179685fd9..d6fdb9eef8c 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
@@ -58,7 +58,7 @@ tests:
           a0a1a2a3a4a5a6a7a8a9aaabacadaeaf 4)EpochStartTime0: 1110000
           5)EpochKey1: b0b1b2b3b4b5b6b7b8b9babbbcbdbebf 6)EpochStartTime1:
           1110001 7)EpochKey2: c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
-          8)EpochStartTime2: 1110002"
+          8)EpochStartTime2: 1110002 9)GroupKeyMulticastPolicy: 0"
       cluster: "Group Key Management"
       endpoint: 0
       command: "KeySetWrite"
@@ -75,6 +75,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
@@ -85,7 +86,7 @@ tests:
           d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0: 2220000
           5)EpochKey1: e0e1e2e3e4e5e6e7e8e9eaebecedeeef 6)EpochStartTime1:
           2220001 7)EpochKey2: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-          8)EpochStartTime2: 2220002"
+          8)EpochStartTime2: 2220002 9)GroupKeyMulticastPolicy: 0"
       cluster: "Group Key Management"
       endpoint: 0
       command: "KeySetWrite"
@@ -102,6 +103,7 @@ tests:
                         EpochStartTime1: 2220001,
                         EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
                         EpochStartTime2: 2220002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
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 0c9aaece96f..8bfcd61b509 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
@@ -45,7 +45,7 @@ tests:
           a0a1a2a3a4a5a6a7a8a9aaabacadaeaf 4)EpochStartTime0: 1110000
           5)EpochKey1: b0b1b2b3b4b5b6b7b8b9babbbcbdbebf 6)EpochStartTime1:
           1110001 7)EpochKey2: c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
-          8)EpochStartTime2: 1110002"
+          8)EpochStartTime2: 1110002 9)GroupKeyMulticastPolicy: 0"
       cluster: "Group Key Management"
       endpoint: 0
       command: "KeySetWrite"
@@ -62,6 +62,7 @@ tests:
                         EpochStartTime1: 1110001,
                         EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                         EpochStartTime2: 1110002,
+                        GroupKeyMulticastPolicy: 0,
                     }
 
     - label:
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 9548c0ea422..dc58fcbcb9d 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
@@ -38,9 +38,10 @@ tests:
           GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
           a0a1a2a3a4a5a6a7a8a9aaabacadaeaf EpochStartTime0: 1110000 EpochKey1:
           b0b1b2b3b4b5b6b7b8b9babbbcbdbebf EpochStartTime1: 1110001 EpochKey2:
-          c0c1c2c3c4c5c6c7c8c9cacbcccdcecf EpochStartTime2: 1110002"
+          c0c1c2c3c4c5c6c7c8c9cacbcccdcecf EpochStartTime2: 1110002
+          GroupKeyMulticastPolicy: 0"
       verification: |
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a1","groupKeySecurityPolicy": 0, "epochKey0":"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf","epochStartTime0": 1110000,"epochKey1":"b0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "epochStartTime1": 1110001,"epochKey2":"c0c1c2c3c4c5c6c7c8c9cacbcccdcecf", "epochStartTime2": 1110002 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a1","groupKeySecurityPolicy": 0, "epochKey0":"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf","epochStartTime0": 1110000,"epochKey1":"b0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "epochStartTime1": 1110001,"epochKey2":"c0c1c2c3c4c5c6c7c8c9cacbcccdcecf", "epochStartTime2": 1110002, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify the "status is success" 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_3_1.yaml b/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
index f6100fac544..1835f0e1255 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
@@ -43,11 +43,11 @@ tests:
           a0a1a2a3a4a5a6a7a8a9aaabacadaeaf * EpochStartTime0: 1110000 *
           EpochKey1: b0b1b2b3b4b5b6b7b8b9babbbcbdbebf * EpochStartTime1: 1110001
           * EpochKey2: c0c1c2c3c4c5c6c7c8c9cacbcccdcecf * EpochStartTime2:
-          1110002"
+          1110002 * GroupKeyMulticastPolicy: 0"
       verification: |
           Please execute the below commands before starting the test case :
 
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a1","groupKeySecurityPolicy": 0, "epochKey0":"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf","epochStartTime0": 1110000,"epochKey1":"b0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "epochStartTime1": 1110001,"epochKey2":"c0c1c2c3c4c5c6c7c8c9cacbcccdcecf", "epochStartTime2": 1110002 }' 1 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": "0x01a1","groupKeySecurityPolicy": 0, "epochKey0":"a0a1a2a3a4a5a6a7a8a9aaabacadaeaf","epochStartTime0": 1110000,"epochKey1":"b0b1b2b3b4b5b6b7b8b9babbbcbdbebf", "epochStartTime1": 1110001,"epochKey2":"c0c1c2c3c4c5c6c7c8c9cacbcccdcecf", "epochStartTime2": 1110002, "groupKeyMulticastPolicy": 0 }' 1 0
 
           Verify the KeySetWrite command  On TH (all-Clusters-app) log and below is the sample log provided for the raspi platform:
 
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index a0f290060c4..81c0279d54e 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -585,6 +585,7 @@ OCC.C.A0030=0
 OCC.C.A0031=0
 OCC.C.A0032=0
 OCC.M.OccupancyChange=1
+OCC.S.E00=1
 
 # PRS
 PRS.S=1
@@ -1926,7 +1927,7 @@ TSTAT.S.F05=1
 TSTAT.S.F06=0
 TSTAT.S.F07=0
 TSTAT.S.F08=1
-TSTAT.S.F0a=0
+TSTAT.S.F0a=1
 
 TSTAT.S.A0000=1
 TSTAT.S.A0001=0
@@ -1956,8 +1957,8 @@ TSTAT.S.A001e=0
 TSTAT.S.A0020=0
 TSTAT.S.A0021=0
 TSTAT.S.A0022=0
-TSTAT.S.A0023=0
-TSTAT.S.A0024=0
+TSTAT.S.A0023=1
+TSTAT.S.A0024=1
 TSTAT.S.A0025=0
 TSTAT.S.A0029=0
 TSTAT.S.A0030=0
@@ -1989,6 +1990,10 @@ TSTAT.S.A004f=0
 TSTAT.S.A0050=1
 TSTAT.S.A0051=0
 TSTAT.S.A0052=0
+TSTAT.S.A0053=1
+TSTAT.S.A0054=1
+TSTAT.S.A0055=1
+TSTAT.S.A0056=1
 
 TSTAT.S.M.MinSetpointDeadBandWritable=1
 TSTAT.S.M.HVACSystemTypeConfigurationWritable=0
@@ -2748,6 +2753,7 @@ SMOKECO.S.A0009=1
 SMOKECO.S.A000a=1
 SMOKECO.S.A000b=1
 SMOKECO.S.A000c=1
+SMOKECO.S.A000d=1
 SMOKECO.S.E00=1
 SMOKECO.S.E01=1
 SMOKECO.S.E02=1
@@ -2761,6 +2767,7 @@ SMOKECO.S.E09=1
 SMOKECO.S.E0a=1
 SMOKECO.M.ManuallyControlledTest=1
 SMOKECO.M.ManuallyControlledMute=1
+SMOKECO.M.InoperativeWhenUnmounted=1
 SMOKECO.S.C00.Rsp=1
 
 #Temperature Controlled Cabinet Mode Cluster
@@ -3180,3 +3187,13 @@ WEBRTCR.S.C00.Rsp=1  # Offer
 WEBRTCR.S.C01.Rsp=1  # Answer  
 WEBRTCR.S.C02.Rsp=1  # ICECandidates
 WEBRTCR.S.C03.Rsp=1  # End
+
+# Joint Fabric Administrator Cluster
+# Server
+JFPKI.S=1
+
+# Client
+JFPKI.C=1
+
+# Attributes
+JFPKI.S.A0000=1 #AdministratorFabricIndex
\ No newline at end of file
diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json
index 890c4f950fa..0f9780d70c0 100644
--- a/src/app/tests/suites/manualTests.json
+++ b/src/app/tests/suites/manualTests.json
@@ -162,7 +162,6 @@
         "Test_TC_CADMIN_1_17",
         "Test_TC_CADMIN_1_18",
         "Test_TC_CADMIN_1_6",
-        "Test_TC_CADMIN_1_10",
         "Test_TC_CADMIN_1_13",
         "Test_TC_CADMIN_1_25"
     ],
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index e6cd7ca7755..998b3735509 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -195,13 +195,13 @@ void emberAfEndpointConfigure()
 {
     uint16_t ep;
 
-    static_assert(FIXED_ENDPOINT_COUNT <= std::numeric_limits<decltype(ep)>::max(),
-                  "FIXED_ENDPOINT_COUNT must not exceed the size of the endpoint data type");
-
     emberEndpointCount = FIXED_ENDPOINT_COUNT;
 
 #if FIXED_ENDPOINT_COUNT > 0
 
+    static_assert(FIXED_ENDPOINT_COUNT <= std::numeric_limits<decltype(ep)>::max(),
+                  "FIXED_ENDPOINT_COUNT must not exceed the size of the endpoint data type");
+
     constexpr uint16_t fixedEndpoints[]             = FIXED_ENDPOINT_ARRAY;
     constexpr uint16_t fixedDeviceTypeListLengths[] = FIXED_DEVICE_TYPE_LENGTHS;
     constexpr uint16_t fixedDeviceTypeListOffsets[] = FIXED_DEVICE_TYPE_OFFSETS;
@@ -936,6 +936,7 @@ uint16_t emberAfGetClusterServerEndpointIndex(EndpointId endpoint, ClusterId clu
         return kEmberInvalidEndpointIndex;
     }
 
+#if FIXED_ENDPOINT_COUNT > 0
     if (epIndex < FIXED_ENDPOINT_COUNT)
     {
         // This endpoint is a fixed one.
@@ -957,6 +958,7 @@ uint16_t emberAfGetClusterServerEndpointIndex(EndpointId endpoint, ClusterId clu
         epIndex = adjustedEndpointIndex;
     }
     else
+#endif // FIXED_ENDPOINT_COUNT > 0
     {
         // This is a dynamic endpoint.
         // Its index is just its index in the dynamic endpoint list, offset by fixedClusterServerEndpointCount.
diff --git a/src/app/zap-templates/zcl/data-model/chip/ambient-context-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ambient-context-sensing-cluster.xml
index 6d65ecd0c0c..2dc6bb5c527 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ambient-context-sensing-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ambient-context-sensing-cluster.xml
@@ -18,34 +18,38 @@ limitations under the License.
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/app_clusters/AmbientContextSensing.adoc
 Parameters: zap -a in-progress sdk-root=./connectedhomeip spec-root=/opt/connectedhomeip-spec /opt/connectedhomeip-spec/src/app_clusters/AmbientContextSensing.adoc 
-Git: 0.9-winter-2026-375-g0a0d00cbe
-Alchemy: v1.6.8
+Git: 0.9-winter-2026-572-g31a450daa
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name=""/>
   <struct name="AmbientContextTypeStruct" apiMaturity="provisional">
     <cluster code="0x0431"/>
-    <item fieldId="0" name="AmbientContextSensed" array="true" type="SemanticTagStruct" length="2"/>
-    <item fieldId="1" name="DetectionStartTime" type="epoch_s" optional="true"/>
-    <item fieldId="2" name="ObjectCountThreshold" type="int16u" optional="true" min="1"/>
-    <item fieldId="3" name="ObjectCount" type="int16u" optional="true" min="1"/>
+    <item fieldId="0" name="AmbientContextSensed" array="true" type="SemanticTagStruct" length="2" apiMaturity="provisional"/>
+    <item fieldId="1" name="DetectionStartTime" type="epoch_s" optional="true" apiMaturity="provisional"/>
   </struct>
 
   <struct name="HoldTimeLimitsStruct" apiMaturity="provisional">
     <cluster code="0x0431"/>
-    <item fieldId="0" name="HoldTimeMin" type="int16u" min="1"/>
-    <item fieldId="1" name="HoldTimeMax" type="int16u" min="10"/>
-    <item fieldId="2" name="HoldTimeDefault" type="int16u" min="1"/>
+    <item fieldId="0" name="HoldTimeMin" type="int16u" min="1" apiMaturity="provisional"/>
+    <item fieldId="1" name="HoldTimeMax" type="int16u" min="10" apiMaturity="provisional"/>
+    <item fieldId="2" name="HoldTimeDefault" type="int16u" min="1" apiMaturity="provisional"/>
+  </struct>
+
+  <struct name="ObjectCountConfigStruct" apiMaturity="provisional">
+    <cluster code="0x0431"/>
+    <item fieldId="0" name="CountingObject" type="SemanticTagStruct" apiMaturity="provisional"/>
+    <item fieldId="1" name="ObjectCountThreshold" type="int16u" min="1" apiMaturity="provisional"/>
   </struct>
 
   <struct name="PredictedActivityStruct" apiMaturity="provisional">
     <cluster code="0x0431"/>
-    <item fieldId="0" name="StartTimestamp" type="epoch_s" max="0xFFFFFFFE"/>
-    <item fieldId="1" name="EndTimestamp" type="epoch_s" min="0x00000001"/>
-    <item fieldId="2" name="AmbientContextType" array="true" type="SemanticTagStruct" optional="true" length="100"/>
-    <item fieldId="3" name="CrowdDetected" type="boolean" optional="true"/>
-    <item fieldId="4" name="CrowdCount" type="int8u" optional="true" min="1" max="254"/>
-    <item fieldId="5" name="Confidence" type="percent"/>
+    <item fieldId="0" name="StartTimestamp" type="epoch_s" max="0xFFFFFFFE" apiMaturity="provisional"/>
+    <item fieldId="1" name="EndTimestamp" type="epoch_s" min="0x00000001" apiMaturity="provisional"/>
+    <item fieldId="2" name="AmbientContextType" array="true" type="SemanticTagStruct" optional="true" length="100" apiMaturity="provisional"/>
+    <item fieldId="3" name="CrowdDetected" type="boolean" optional="true" apiMaturity="provisional"/>
+    <item fieldId="4" name="CrowdCount" type="int8u" optional="true" min="1" max="254" apiMaturity="provisional"/>
+    <item fieldId="5" name="Confidence" type="percent" apiMaturity="provisional"/>
   </struct>
 
   <cluster apiMaturity="provisional">
@@ -53,7 +57,7 @@ Alchemy: v1.6.8
     <name>Ambient Context Sensing</name>
     <code>0x0431</code>
     <define>AMBIENT_CONTEXT_SENSING_CLUSTER</define>
-    <description>This cluster provides data modeling and protocol implementation of ambient context sensing features.</description>
+    <description>This server cluster provides an interface to ambient context sensing functionality.</description>
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <globalAttribute code="0xFFFD" side="either" value="1"/>
@@ -115,25 +119,64 @@ Alchemy: v1.6.8
         </mandatoryConform>
       </otherwiseConform>
     </attribute>
-    <attribute code="0x0005" side="server" name="SimultaneousDetectionLimit" define="SIMULTANEOUS_DETECTION_LIMIT" type="int8u" writable="true" max="10"/>
-    <attribute code="0x0006" side="server" name="ObjectCountReached" define="OBJECT_COUNT_REACHED" type="boolean" optional="true">
+    <attribute code="0x0005" side="server" name="ObjectCountReached" define="OBJECT_COUNT_REACHED" type="boolean" optional="true">
       <mandatoryConform>
-        <feature name="OC"/>
+        <andTerm>
+          <feature name="OC"/>
+          <feature name="OI"/>
+        </andTerm>
       </mandatoryConform>
     </attribute>
-    <attribute code="0x0007" side="server" name="HoldTime" define="HOLD_TIME" type="int16u" writable="true">
+    <attribute code="0x0006" side="server" name="ObjectCountConfig" define="OBJECT_COUNT_CONFIG" type="ObjectCountConfigStruct" writable="true" optional="true">
       <access op="write" privilege="manage"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="OC"/>
+          <feature name="OI"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0007" side="server" name="ObjectCount" define="OBJECT_COUNT" type="int16u" min="1" optional="true">
+      <optionalConform>
+        <andTerm>
+          <feature name="OC"/>
+          <feature name="OI"/>
+        </andTerm>
+      </optionalConform>
     </attribute>
-    <attribute code="0x0008" side="server" name="HoldTimeLimits" define="HOLD_TIME_LIMITS" type="HoldTimeLimitsStruct"/>
-    <attribute code="0x0009" side="server" name="PredictedActivity" define="PREDICTED_ACTIVITY" type="array" optional="true" entryType="PredictedActivityStruct" length="20">
+    <attribute code="0x0008" side="server" name="SimultaneousDetectionLimit" define="SIMULTANEOUS_DETECTION_LIMIT" type="int8u" max="10" writable="true"/>
+    <attribute code="0x0009" side="server" name="HoldTime" define="HOLD_TIME" type="int16u" writable="true">
       <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute code="0x000A" side="server" name="HoldTimeLimits" define="HOLD_TIME_LIMITS" type="HoldTimeLimitsStruct"/>
+    <attribute code="0x000B" side="server" name="PredictedActivity" define="PREDICTED_ACTIVITY" type="array" entryType="PredictedActivityStruct" length="20" optional="true">
       <mandatoryConform>
         <feature name="PRED"/>
       </mandatoryConform>
     </attribute>
-    <event code="0x0000" name="AmbientContextDetected" priority="info" side="server" optional="true">
-      <field id="0" name="AmbientContextType" array="true" type="AmbientContextTypeStruct" length="10" minLength="1"/>
-      <description>This event SHALL be generated when AmbientContextType attribute changes due to any attribute change from HumanActivityDetected, ObjectIdentified, AudioContextDetected, ObjectCountReached attributes.</description>
+    <event code="0x0000" name="AmbientContextDetectStarted" priority="info" side="server" optional="true">
+      <field id="0" name="AmbientContextType" array="true" type="AmbientContextTypeStruct" optional="true"/>
+      <field id="1" name="ObjectCount" type="int16u" optional="true" min="1"/>
+      <description>This event SHALL be generated when there is at least one of HumanActivityDetected or ObjectIdentified or AudioContextDetected or ObjectCountReached attribute changes from False To True.</description>
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="HA"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <feature name="OI"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <feature name="AUD"/>
+        </mandatoryConform>
+        <mandatoryConform>
+          <feature name="OC"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </event>
+
+    <event code="0x0001" name="AmbientContextDetectEnded" priority="info" side="server" optional="true">
+      <field id="0" name="StartEventNumber" type="event_no"/>
+      <description>This event SHALL be generated when there is a negative Boolean state change from HumanActivityDetected or ObjectIdentified or AudioContextDetected or ObjectCountReached attribute.</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="HA"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
index faba5e32987..7c4df7d0033 100644
--- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021-2025 Project CHIP Authors
+Copyright (c) 2021-2026 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,20 @@ limitations under the License.
 <!--
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/service_device_management/BasicInformationCluster.adoc
-Parameters: zap attribute=improved-capabilities-tcr,cluster-rev-conformance sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/Interaction-Model.adoc ../connectedhomeip-spec/src/data_model/Data-Model.adoc ../connectedhomeip-spec/src/service_device_management/BasicInformationCluster.adoc 
-Git: 1.5-base-64-ge13c53cfd
-Alchemy: v1.6.1
+Parameters: zap attribute=improved-capabilities-tcr sdk-root=../../connectedhomeip/ spec-root=../../connectedhomeip-spec-master/ ../../connectedhomeip-spec-master/src/data_model/Data-Model.adoc ../../connectedhomeip-spec-master/src/service_device_management/DiagnosticsGeneral.adoc ../../connectedhomeip-spec-master/src/data_model/BridgedDeviceBasicInformationCluster.adoc ../../connectedhomeip-spec-master/src/service_device_management/BasicInformationCluster.adoc 
+Git: 0.9-summer2026
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
   <struct name="CapabilityMinimaStruct">
     <cluster code="0x0028"/>
-    <item fieldId="0" name="CaseSessionsPerFabric" type="int16u" writable="false" default="3" min="3"/>
-    <item fieldId="1" name="SubscriptionsPerFabric" type="int16u" writable="false" default="3" min="3"/>
-    <item fieldId="2" name="SimultaneousInvocationsSupported" type="int16u" optional="true" min="1"/>
-    <item fieldId="3" name="SimultaneousWritesSupported" type="int16u" optional="true" min="1"/>
-    <item fieldId="4" name="ReadPathsSupported" type="int16u" optional="true" min="9"/>
-    <item fieldId="5" name="SubscribePathsSupported" type="int16u" optional="true" min="3"/>
+    <item fieldId="0" name="CaseSessionsPerFabric" type="int16u" writable="false" default="3" min="3" max="10000"/>
+    <item fieldId="1" name="SubscriptionsPerFabric" type="int16u" writable="false" default="3" min="3" max="10000"/>
+    <item fieldId="2" name="SimultaneousInvocationsSupported" type="int16u" optional="true" min="1" max="10000"/>
+    <item fieldId="3" name="SimultaneousWritesSupported" type="int16u" optional="true" min="1" max="10000"/>
+    <item fieldId="4" name="ReadPathsSupported" type="int16u" optional="true" min="9" max="10000"/>
+    <item fieldId="5" name="SubscribePathsSupported" type="int16u" optional="true" min="3" max="10000"/>
   </struct>
 
   <enum name="ProductFinishEnum" type="enum8">
@@ -171,7 +171,7 @@ Alchemy: v1.6.1
     </attribute>
     <event side="server" code="0x00" name="StartUp" priority="critical">
       <description>The StartUp event SHALL be generated by a Node as soon as reasonable after completing a boot or reboot process.</description>
-      <field id="0" name="SoftwareVersion" type="int32u"/>
+      <field id="0" fieldId="0" name="SoftwareVersion" type="int32u"/>
     </event>
 
     <event side="server" code="0x01" name="ShutDown" priority="critical" optional="true">
@@ -181,13 +181,13 @@ Alchemy: v1.6.1
 
     <event side="server" code="0x02" name="Leave" priority="info" optional="true">
       <description>The Leave event SHOULD be generated by a Node prior to permanently leaving a given Fabric, such as when the RemoveFabric command is invoked for a given fabric, or triggered by factory reset or some other manufacturer specific action to disable or reset the operational data in the Node.</description>
-      <field id="0" name="FabricIndex" type="fabric_idx" min="1" max="254"/>
+      <field id="0" fieldId="0" name="FabricIndex" type="fabric_idx" min="1" max="254"/>
       <optionalConform/>
     </event>
 
     <event side="server" code="0x03" name="ReachableChanged" priority="info" optional="true">
       <description>This event (when supported) SHALL be generated when there is a change in the Reachable attribute.</description>
-      <field id="0" name="ReachableNewValue" type="boolean"/>
+      <field id="0" fieldId="0" name="ReachableNewValue" type="boolean"/>
       <mandatoryConform>
         <attribute name="Reachable"/>
       </mandatoryConform>
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml
index 9e49e33a020..1d6c3a2fdf7 100644
--- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021-2025 Project CHIP Authors
+Copyright (c) 2021-2026 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,9 +17,9 @@ limitations under the License.
 <!--
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/data_model/BridgedDeviceBasicInformationCluster.adoc
-Parameters: zap attribute=improved-capabilities-tcr,cluster-rev-conformance sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/Interaction-Model.adoc ../connectedhomeip-spec/src/data_model/Data-Model.adoc ../connectedhomeip-spec/src/data_model/BridgedDeviceBasicInformationCluster.adoc 
-Git: 1.5-base-64-ge13c53cfd
-Alchemy: v1.6.1
+Parameters: zap attribute=improved-capabilities-tcr sdk-root=../../connectedhomeip/ spec-root=../../connectedhomeip-spec-master/ ../../connectedhomeip-spec-master/src/data_model/Data-Model.adoc ../../connectedhomeip-spec-master/src/service_device_management/DiagnosticsGeneral.adoc ../../connectedhomeip-spec-master/src/data_model/BridgedDeviceBasicInformationCluster.adoc ../../connectedhomeip-spec-master/src/service_device_management/BasicInformationCluster.adoc 
+Git: 0.9-summer2026
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
@@ -162,8 +162,8 @@ Alchemy: v1.6.1
     </attribute>
     <command source="client" code="0x80" name="KeepActive" optional="true">
       <description>Upon receipt, the server SHALL attempt to keep the bridged device active for the duration specified by the command, when the device is next active.</description>
-      <arg id="0" name="StayActiveDuration" type="int32u"/>
-      <arg id="1" name="TimeoutMs" type="int32u" min="30000" max="3600000"/>
+      <arg fieldId="0" name="StayActiveDuration" type="int32u"/>
+      <arg fieldId="1" name="TimeoutMs" type="int32u" min="30000" max="3600000"/>
       <mandatoryConform>
         <feature name="BIS"/>
       </mandatoryConform>
@@ -171,7 +171,7 @@ Alchemy: v1.6.1
 
     <event side="server" code="0x00" name="StartUp" priority="critical" optional="true">
       <description>The StartUp event SHALL be generated by a Node as soon as reasonable after completing a boot or reboot process.</description>
-      <field id="0" name="SoftwareVersion" type="int32u"/>
+      <field id="0" fieldId="0" name="SoftwareVersion" type="int32u"/>
       <optionalConform/>
     </event>
 
@@ -187,12 +187,12 @@ Alchemy: v1.6.1
 
     <event side="server" code="0x03" name="ReachableChanged" priority="info">
       <description>This event SHALL be generated when there is a change in the Reachable attribute.</description>
-      <field id="0" name="ReachableNewValue" type="boolean"/>
+      <field id="0" fieldId="0" name="ReachableNewValue" type="boolean"/>
     </event>
 
     <event side="server" code="0x80" name="ActiveChanged" priority="info" optional="true" apiMaturity="provisional">
       <description>This event (when supported) SHALL be generated the next time a bridged device becomes active after a KeepActive command is received.</description>
-      <field id="0" name="PromisedActiveDuration" type="int32u"/>
+      <field id="0" fieldId="0" name="PromisedActiveDuration" type="int32u"/>
       <mandatoryConform>
         <feature name="BIS"/>
       </mandatoryConform>
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
index 9191cdbd1ec..d0b90357cc7 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021-2025 Project CHIP Authors
+Copyright (c) 2021-2026 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,9 +17,9 @@ limitations under the License.
 <!--
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/service_device_management/DiagnosticsGeneral.adoc
-Parameters: zap attribute=improved-capabilities-tcr,cluster-rev-conformance sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/Interaction-Model.adoc ../connectedhomeip-spec/src/data_model/Data-Model.adoc ../connectedhomeip-spec/src/service_device_management/DiagnosticsGeneral.adoc 
-Git: 1.5-base-144-gf66d1da7d-dirty
-Alchemy: v1.6.3
+Parameters: zap attribute=improved-capabilities-tcr sdk-root=../../connectedhomeip/ spec-root=../../connectedhomeip-spec-master/ ../../connectedhomeip-spec-master/src/data_model/Data-Model.adoc ../../connectedhomeip-spec-master/src/service_device_management/DiagnosticsGeneral.adoc ../../connectedhomeip-spec-master/src/data_model/BridgedDeviceBasicInformationCluster.adoc ../../connectedhomeip-spec-master/src/service_device_management/BasicInformationCluster.adoc 
+Git: 0.9-summer2026
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
@@ -112,9 +112,6 @@ Alchemy: v1.6.3
       <feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
         <describedConform/>
       </feature>
-      <feature bit="1" code="LOAD" name="DeviceLoad" summary="Support for reporting device load metrics (mandatory in revision 3 and above)">
-        <mandatoryConform/>
-      </feature>
     </features>
     <attribute side="server" code="0x00" name="NetworkInterfaces" define="NETWORK_INTERFACES" type="array" entryType="NetworkInterface" length="8"/>
     <attribute side="server" code="0x01" name="RebootCount" define="REBOOT_COUNT" type="int16u"/>
@@ -144,7 +141,10 @@ Alchemy: v1.6.3
     <attribute code="0x000A" side="server" name="DeviceLoadStatus" define="DEVICE_LOAD_STATUS" type="DeviceLoadStruct" optional="true">
       <quality changeOmitted="true"/>
       <mandatoryConform>
-        <feature name="LOAD"/>
+        <greaterOrEqualTerm>
+          <revision value="current"/>
+          <revision value="3"/>
+        </greaterOrEqualTerm>
       </mandatoryConform>
     </attribute>
     <!--
@@ -158,8 +158,8 @@ Alchemy: v1.6.3
     -->
     <command source="client" code="0x00" name="TestEventTrigger">
       <description>This command SHALL be supported to provide a means for certification tests to trigger some test-plan-specific events, necessary to assist in automation of device interactions for some certification test cases.</description>
-      <arg id="0" name="EnableKey" type="octet_string" length="16" minLength="16"/>
-      <arg id="1" name="EventTrigger" type="int64u"/>
+      <arg fieldId="0" name="EnableKey" type="octet_string" length="16" minLength="16"/>
+      <arg fieldId="1" name="EventTrigger" type="int64u"/>
       <access op="invoke" role="manage"/>
     </command>
 
@@ -169,15 +169,15 @@ Alchemy: v1.6.3
 
     <command source="server" code="0x02" name="TimeSnapshotResponse" apiMaturity="provisional" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to a TimeSnapshot command.</description>
-      <arg id="0" name="SystemTimeMs" type="systime_ms"/>
-      <arg id="1" name="PosixTimeMs" type="posix_ms" isNullable="true"/>
+      <arg fieldId="0" name="SystemTimeMs" type="systime_ms"/>
+      <arg fieldId="1" name="PosixTimeMs" type="posix_ms" isNullable="true"/>
     </command>
 
     <command source="client" code="0x03" name="PayloadTestRequest" response="PayloadTestResponse" optional="true">
       <description>This command provides a means for certification tests or manufacturer&apos;s internal tests to validate particular command handling and encoding constraints by generating a response of a given size.</description>
-      <arg id="0" name="EnableKey" type="octet_string" length="16" minLength="16"/>
-      <arg id="1" name="Value" type="int8u"/>
-      <arg id="2" name="Count" type="int16u" max="2048"/>
+      <arg fieldId="0" name="EnableKey" type="octet_string" length="16" minLength="16"/>
+      <arg fieldId="1" name="Value" type="int8u"/>
+      <arg fieldId="2" name="Count" type="int16u" max="2048"/>
       <access op="invoke" role="manage"/>
       <mandatoryConform>
         <feature name="DMTEST"/>
@@ -186,7 +186,7 @@ Alchemy: v1.6.3
 
     <command source="server" code="0x04" name="PayloadTestResponse" optional="true" disableDefaultResponse="true">
       <description>This command is sent by the server on receipt of the PayloadTestRequest command.</description>
-      <arg id="0" name="Payload" type="long_octet_string" length="2048"/>
+      <arg fieldId="0" name="Payload" type="long_octet_string" length="2048"/>
       <mandatoryConform>
         <feature name="DMTEST"/>
       </mandatoryConform>
@@ -194,28 +194,28 @@ Alchemy: v1.6.3
 
     <event side="server" code="0x00" name="HardwareFaultChange" priority="critical" optional="true">
       <description>The HardwareFaultChange Event SHALL indicate a change in the set of hardware faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="HardwareFaultEnum" array="true" length="11"/>
-      <field id="1" name="Previous" type="HardwareFaultEnum" array="true" length="11"/>
+      <field id="0" fieldId="0" name="Current" type="HardwareFaultEnum" array="true" length="11"/>
+      <field id="1" fieldId="1" name="Previous" type="HardwareFaultEnum" array="true" length="11"/>
       <optionalConform/>
     </event>
 
     <event side="server" code="0x01" name="RadioFaultChange" priority="critical" optional="true">
       <description>The RadioFaultChange Event SHALL indicate a change in the set of radio faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="RadioFaultEnum" array="true" length="7"/>
-      <field id="1" name="Previous" type="RadioFaultEnum" array="true" length="7"/>
+      <field id="0" fieldId="0" name="Current" type="RadioFaultEnum" array="true" length="7"/>
+      <field id="1" fieldId="1" name="Previous" type="RadioFaultEnum" array="true" length="7"/>
       <optionalConform/>
     </event>
 
     <event side="server" code="0x02" name="NetworkFaultChange" priority="critical" optional="true">
       <description>The NetworkFaultChange Event SHALL indicate a change in the set of network faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="NetworkFaultEnum" array="true" length="4"/>
-      <field id="1" name="Previous" type="NetworkFaultEnum" array="true" length="4"/>
+      <field id="0" fieldId="0" name="Current" type="NetworkFaultEnum" array="true" length="4"/>
+      <field id="1" fieldId="1" name="Previous" type="NetworkFaultEnum" array="true" length="4"/>
       <optionalConform/>
     </event>
 
     <event side="server" code="0x03" name="BootReason" priority="critical">
       <description>The BootReason Event SHALL indicate the reason that caused the device to start-up.</description>
-      <field id="0" name="BootReason" type="BootReasonEnum" max="0x06"/>
+      <field id="0" fieldId="0" name="BootReason" type="BootReasonEnum" max="0x06"/>
     </event>
 
   </cluster>
diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
index 9cafd3eacf1..88677f43b50 100644
--- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2026 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,22 +14,38 @@ 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.
 -->
-<configurator>
-  <domain name="CHIP" />
-
+<!--
+XML generated by Alchemy; DO NOT EDIT.
+Source: src/data_model/Group-Key-Management-Cluster.adoc
+Parameters: zap specRoot ../../mains/connectedhomeip-spec sdkRoot . ../../mains//connectedhomeip-spec/src/data_model/Group-Key-Management-Cluster.adoc attribute=in-progress 
+Git: 0.9-summer2026
+Alchemy: v1.6.9
+-->
+<!--
+TODO: GroupKeySetStruct has been manually modified to non-fabric-scoped. 
+The change has to be done in the spec or Alchemy's errata.
+-->
+<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
+  <domain name="CHIP"/>
   <struct name="GroupKeyMapStruct" isFabricScoped="true">
     <cluster code="0x003F"/>
     <item fieldId="1" name="GroupId" type="group_id"/>
-    <item fieldId="2" name="GroupKeySetID" type="int16u"/>
+    <item fieldId="2" name="GroupKeySetID" type="int16u" min="1"/>
   </struct>
 
   <struct name="GroupInfoMapStruct" isFabricScoped="true">
     <cluster code="0x003F"/>
     <item fieldId="1" name="GroupId" type="group_id"/>
-    <item fieldId="2" name="Endpoints" type="endpoint_no" array="true"/>
+    <item fieldId="2" name="Endpoints" type="endpoint_no" array="true" minLength="1"/>
     <item fieldId="3" name="GroupName" type="char_string" length="16" optional="true"/>
   </struct>
 
+  <enum name="GroupKeyMulticastPolicyEnum" type="enum8">
+    <cluster code="0x003F"/>
+    <item name="PerGroupID" value="0x00"/>
+    <item name="AllNodes" value="0x01"/>
+  </enum>
+
   <enum name="GroupKeySecurityPolicyEnum" type="enum8">
     <cluster code="0x003F"/>
     <item name="TrustFirst" value="0x00"/>
@@ -39,13 +55,19 @@ limitations under the License.
   <struct name="GroupKeySetStruct">
     <cluster code="0x003F"/>
     <item fieldId="0" name="GroupKeySetID" type="int16u"/>
-    <item fieldId="1" name="GroupKeySecurityPolicy" type="GroupKeySecurityPolicyEnum"/>
-    <item fieldId="2" name="EpochKey0" type="octet_string" length="16" isNullable="true"/>
+    <item fieldId="1" name="GroupKeySecurityPolicy" type="GroupKeySecurityPolicyEnum" max="0x01"/>
+    <item fieldId="2" name="EpochKey0" type="octet_string" length="16" isNullable="true" minLength="16"/>
     <item fieldId="3" name="EpochStartTime0" type="epoch_us" isNullable="true"/>
-    <item fieldId="4" name="EpochKey1" type="octet_string" length="16" isNullable="true"/>
+    <item fieldId="4" name="EpochKey1" type="octet_string" length="16" isNullable="true" minLength="16"/>
     <item fieldId="5" name="EpochStartTime1" type="epoch_us" isNullable="true"/>
-    <item fieldId="6" name="EpochKey2" type="octet_string" length="16" isNullable="true"/>
+    <item fieldId="6" name="EpochKey2" type="octet_string" length="16" isNullable="true" minLength="16"/>
     <item fieldId="7" name="EpochStartTime2" type="epoch_us" isNullable="true"/>
+    <item fieldId="8" name="GroupKeyMulticastPolicy" type="GroupKeyMulticastPolicyEnum" max="0x01"/>
+  </struct>
+
+  <struct name="GroupcastAdoptionStruct" apiMaturity="provisional" isFabricScoped="true">
+    <cluster code="0x003F"/>
+    <item fieldId="0" name="GroupcastAdopted" type="boolean" apiMaturity="provisional"/>
   </struct>
 
   <cluster>
@@ -54,69 +76,61 @@ limitations under the License.
     <code>0x003F</code>
     <define>GROUP_KEY_MANAGEMENT_CLUSTER</define>
     <description>The Group Key Management Cluster is the mechanism by which group keys are managed.</description>
-
+    <client init="false" tick="false">true</client>
+    <server init="false" tick="false">true</server>
     <features>
       <feature bit="0" code="CS" name="CacheAndSync" summary="The ability to support CacheAndSync security policy and MCSP.">
-        <optionalConform/>
+        <provisionalConform/>
+      </feature>
+      <feature bit="1" code="GCAST" name="Groupcast" summary="The device supports groups using the Groupcast cluster.">
+        <mandatoryConform/>
       </feature>
     </features>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
-    <attribute side="server" code="0x0000" name="GroupKeyMap" define="GROUP_KEY_MAP" type="array" length="254" entryType="GroupKeyMapStruct" writable="true" optional="false">
-      <access op="read" privilege="view"/>
+    <globalAttribute side="either" code="0xFFFD" value="3"/>
+    <attribute side="server" code="0x0000" name="GroupKeyMap" define="GROUP_KEY_MAP" type="array" length="254" entryType="GroupKeyMapStruct" writable="true">
       <access op="write" privilege="manage"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0001" name="GroupTable" define="GROUP_TABLE" type="array" length="254" entryType="GroupInfoMapStruct">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0002" name="MaxGroupsPerFabric" define="MAX_GROUPS_PER_FABRIC" type="int16u">
-      <mandatoryConform/>
     </attribute>
-    <attribute side="server" code="0x0003" name="MaxGroupKeysPerFabric" define="MAX_GROUP_KEYS_PER_FABRIC" type="int16u">
-      <mandatoryConform/>
+    <attribute side="server" code="0x0001" name="GroupTable" define="GROUP_TABLE" type="array" length="254" entryType="GroupInfoMapStruct"/>
+    <attribute side="server" code="0x0002" name="MaxGroupsPerFabric" define="MAX_GROUPS_PER_FABRIC" type="int16u" default="0"/>
+    <attribute side="server" code="0x0003" name="MaxGroupKeysPerFabric" define="MAX_GROUP_KEYS_PER_FABRIC" type="int16u" min="1" default="1"/>
+    <attribute code="0x0004" side="server" name="GroupcastAdoption" define="GROUPCAST_ADOPTION" type="array" entryType="GroupcastAdoptionStruct" writable="true" optional="true">
+      <access op="read" privilege="administer"/>
+      <access op="write" privilege="administer"/>
+      <mandatoryConform>
+        <feature name="GCAST"/>
+      </mandatoryConform>
     </attribute>
-    
-    <command source="client" code="0x00" name="KeySetWrite" isFabricScoped="true" optional="false" cli="zcl GroupKeyManagement KeySetWrite">
-      <description>Write a new set of keys for the given key set id.</description>
-      <arg name="GroupKeySet" type="GroupKeySetStruct"/>
+    <command source="client" code="0x00" name="KeySetWrite" isFabricScoped="true" cli="zcl GroupKeyManagement KeySetWrite">
+      <description>This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys.</description>
+      <arg fieldId="0" name="GroupKeySet" type="GroupKeySetStruct"/>
       <access op="invoke" privilege="administer"/>
-      <mandatoryConform/>
     </command>
 
-    <command source="client" code="0x01" name="KeySetRead" isFabricScoped="true" response="KeySetReadResponse" optional="false" cli="zcl GroupKeyManagement KeySetRead">
-      <description>Read the keys for a given key set id.</description>
-      <arg name="GroupKeySetID" type="int16u"/>
+    <command source="client" code="0x01" name="KeySetRead" isFabricScoped="true" response="KeySetReadResponse" cli="zcl GroupKeyManagement KeySetRead">
+      <description>This command is used by Administrators to read the state of a given Group Key Set.</description>
+      <arg fieldId="0" name="GroupKeySetID" type="int16u"/>
       <access op="invoke" privilege="administer"/>
-      <mandatoryConform/>
     </command>
 
-    <command source="server" code="0x02" name="KeySetReadResponse" optional="false" disableDefaultResponse="true">
-      <description>
-       Response to KeySetRead
-      </description>
-      <arg name="GroupKeySet" type="GroupKeySetStruct"/>
-      <mandatoryConform/>
+    <command source="server" code="0x02" name="KeySetReadResponse" disableDefaultResponse="true">
+      <description>This command SHALL be generated in response to the KeySetRead command, if a valid Group Key Set was found.</description>
+      <arg fieldId="0" name="GroupKeySet" type="GroupKeySetStruct"/>
     </command>
 
-    <command source="client" code="0x03" name="KeySetRemove" isFabricScoped="true" optional="false" cli="zcl GroupKeyManagement KeySetRemove">
-      <description>Revoke a Root Key from a Group</description>
-      <arg name="GroupKeySetID" type="int16u"/>
+    <command source="client" code="0x03" name="KeySetRemove" isFabricScoped="true" cli="zcl GroupKeyManagement KeySetRemove">
+      <description>This command is used by Administrators to remove all state of a given Group Key Set.</description>
+      <arg fieldId="0" name="GroupKeySetID" type="int16u"/>
       <access op="invoke" privilege="administer"/>
-      <mandatoryConform/>
     </command>
 
-    <command source="client" code="0x04" name="KeySetReadAllIndices" response="KeySetReadAllIndicesResponse" isFabricScoped="true" optional="false" cli="zcl GroupKeyManagement KeySetReadAllIndices">
-      <description>Return the list of Group Key Sets associated with the accessing fabric</description>
+    <command source="client" code="0x04" name="KeySetReadAllIndices" response="KeySetReadAllIndicesResponse" isFabricScoped="true" cli="zcl GroupKeyManagement KeySetReadAllIndices">
+      <description>This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
-      <mandatoryConform/>
     </command>
 
-    <command source="server" code="0x05" name="KeySetReadAllIndicesResponse" optional="false" disableDefaultResponse="true">
-      <description>
-        Reseponse to KeySetReadAllIndices
-      </description>
-      <arg name="GroupKeySetIDs" type="int16u" array="true"/>
-      <mandatoryConform/>
+    <command source="server" code="0x05" name="KeySetReadAllIndicesResponse" disableDefaultResponse="true">
+      <description>This command SHALL be generated in response to KeySetReadAllIndices and it SHALL contain the list of _GroupKeySetID_ for all Group Key Sets associated with the scoped Fabric.</description>
+      <arg fieldId="0" name="GroupKeySetIDs" type="int16u" array="true"/>
     </command>
 
   </cluster>
diff --git a/src/app/zap-templates/zcl/data-model/chip/groupcast-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groupcast-cluster.xml
index 6be8efef8a7..0a2c959f66b 100644
--- a/src/app/zap-templates/zcl/data-model/chip/groupcast-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/groupcast-cluster.xml
@@ -17,9 +17,9 @@ limitations under the License.
 <!--
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/service_device_management/Groupcast.adoc
-Parameters: zap attribute=in-progress spec-root ./spec sdk-root ./ricardo/3 ./spec/src/service_device_management/Groupcast.adoc 
-Git: 0.9-winter-2026-459-gce0add264
-Alchemy: v1.6.8
+Parameters: zap specRoot ../connectedhomeip-spec sdkRoot ../../forks/connectedhomeip attribute=in-progress src/service_device_management/Groupcast.adoc 
+Git: 0.9-summer2026-dirty
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="General"/>
@@ -55,7 +55,7 @@ Alchemy: v1.6.8
     <item fieldId="4" name="McastAddrPolicy" type="MulticastAddrPolicyEnum" default="0x00" max="0x01"/>
   </struct>
 
-  <cluster>
+  <cluster apiMaturity="provisional">
     <domain>General</domain>
     <name>Groupcast</name>
     <code>0x0065</code>
@@ -108,13 +108,13 @@ Alchemy: v1.6.8
     <command code="0x00" source="client" name="JoinGroup" isFabricScoped="true">
       <description>This command SHALL be used to instruct the server to join a multicast group.</description>
       <access op="invoke" privilege="manage"/>
-      <arg id="0" name="GroupID" type="group_id" min="1"/>
-      <arg id="1" name="Endpoints" array="true" type="endpoint_no"/>
-      <arg id="2" name="KeySetID" type="int16u"/>
-      <arg id="3" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
-      <arg id="4" name="UseAuxiliaryACL" type="boolean" optional="true"/>
-      <arg id="5" name="ReplaceEndpoints" type="boolean" optional="true"/>
-      <arg id="6" name="McastAddrPolicy" type="MulticastAddrPolicyEnum" optional="true" max="0x01"/>
+      <arg fieldId="0" name="GroupID" type="group_id" min="1"/>
+      <arg fieldId="1" name="Endpoints" array="true" type="endpoint_no"/>
+      <arg fieldId="2" name="KeySetID" type="int16u"/>
+      <arg fieldId="3" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
+      <arg fieldId="4" name="UseAuxiliaryACL" type="boolean" optional="true"/>
+      <arg fieldId="5" name="ReplaceEndpoints" type="boolean" optional="true"/>
+      <arg fieldId="6" name="McastAddrPolicy" type="MulticastAddrPolicyEnum" optional="true" max="0x01"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
@@ -124,8 +124,8 @@ Alchemy: v1.6.8
     <command code="0x01" source="client" name="LeaveGroup" isFabricScoped="true" response="LeaveGroupResponse">
       <description>This command SHALL allow a maintainer to request that the server withdraws itself or specific endpoints from a specific group or from all groups of this client&apos;s fabric.</description>
       <access op="invoke" privilege="manage"/>
-      <arg id="0" name="GroupID" type="group_id"/>
-      <arg id="1" name="Endpoints" array="true" type="endpoint_no" optional="true" length="20" minLength="1"/>
+      <arg fieldId="0" name="GroupID" type="group_id"/>
+      <arg fieldId="1" name="Endpoints" array="true" type="endpoint_no" optional="true" length="20" minLength="1"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
@@ -134,8 +134,8 @@ Alchemy: v1.6.8
 
     <command code="0x02" source="server" name="LeaveGroupResponse" isFabricScoped="true" disableDefaultResponse="true">
       <description>This command SHALL allow the server to inform the client about the result of the LeaveGroup command.</description>
-      <arg id="0" name="GroupID" type="group_id"/>
-      <arg id="1" name="Endpoints" array="true" type="endpoint_no" length="20"/>
+      <arg fieldId="0" name="GroupID" type="group_id"/>
+      <arg fieldId="1" name="Endpoints" array="true" type="endpoint_no" length="20"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
@@ -145,9 +145,9 @@ Alchemy: v1.6.8
     <command code="0x03" source="client" name="UpdateGroupKey" isFabricScoped="true">
       <description>This command SHALL allow a fabric administrator to update the OperationalGroupKey associated with the existing group identified by GroupID, which is already joined.</description>
       <access op="invoke" privilege="manage"/>
-      <arg id="0" name="GroupID" type="group_id" min="1"/>
-      <arg id="1" name="KeySetID" type="int16u"/>
-      <arg id="2" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
+      <arg fieldId="0" name="GroupID" type="group_id" min="1"/>
+      <arg fieldId="1" name="KeySetID" type="int16u"/>
+      <arg fieldId="2" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
@@ -157,8 +157,8 @@ Alchemy: v1.6.8
     <command code="0x04" source="client" name="ConfigureAuxiliaryACL" isFabricScoped="true" optional="true">
       <description>This command SHALL allow an Administrator to enable or disable the generation of AuxiliaryACL entries in the Access Control Cluster based on the groups joined (see Groupcast Auxiliary ACL Handling).</description>
       <access op="invoke" privilege="administer"/>
-      <arg id="0" name="GroupID" type="group_id"/>
-      <arg id="1" name="UseAuxiliaryACL" type="boolean"/>
+      <arg fieldId="0" name="GroupID" type="group_id"/>
+      <arg fieldId="1" name="UseAuxiliaryACL" type="boolean"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform>
@@ -170,8 +170,8 @@ Alchemy: v1.6.8
     <command code="0x05" source="client" name="GroupcastTesting" isFabricScoped="true">
       <description>This command SHALL allow an Administrator to configure test modes that allow validation of Groupcast communication.</description>
       <access op="invoke" privilege="administer"/>
-      <arg id="0" name="TestOperation" type="GroupcastTestingEnum" max="0x02"/>
-      <arg id="1" name="DurationSeconds" type="int16u" optional="true" default="60" min="10" max="1200"/>
+      <arg fieldId="0" name="TestOperation" type="GroupcastTestingEnum" max="0x02"/>
+      <arg fieldId="1" name="DurationSeconds" type="int16u" optional="true" default="60" min="10" max="1200"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
@@ -181,14 +181,14 @@ Alchemy: v1.6.8
     <event code="0x0000" name="GroupcastTesting" priority="info" side="server" isFabricSensitive="true">
       <description>This event SHALL be generated during Groupcast testing processing after invocation of the GroupcastTesting command, under the conditions stated in that command&apos;s Effect on Receipt section.</description>
       <access op="read" privilege="administer"/>
-      <field id="0" name="SourceIpAddress" type="octet_string" optional="true" min="16" max="16"/>
-      <field id="1" name="DestinationIpAddress" type="octet_string" optional="true" min="16" max="16"/>
-      <field id="2" name="GroupID" type="group_id" optional="true"/>
-      <field id="3" name="EndpointID" type="endpoint_no" optional="true"/>
-      <field id="4" name="ClusterID" type="cluster_id" optional="true"/>
-      <field id="5" name="ElementID" type="int32u" optional="true"/>
-      <field id="6" name="AccessAllowed" type="boolean" optional="true"/>
-      <field id="7" name="GroupcastTestResult" type="GroupcastTestResultEnum" max="0x05"/>
+      <field id="0" fieldId="0" name="SourceIpAddress" type="octet_string" optional="true" min="16" max="16"/>
+      <field id="1" fieldId="1" name="DestinationIpAddress" type="octet_string" optional="true" min="16" max="16"/>
+      <field id="2" fieldId="2" name="GroupID" type="group_id" optional="true"/>
+      <field id="3" fieldId="3" name="EndpointID" type="endpoint_no" optional="true"/>
+      <field id="4" fieldId="4" name="ClusterID" type="cluster_id" optional="true"/>
+      <field id="5" fieldId="5" name="ElementID" type="int32u" optional="true"/>
+      <field id="6" fieldId="6" name="AccessAllowed" type="boolean" optional="true"/>
+      <field id="7" fieldId="7" name="GroupcastTestResult" type="GroupcastTestResultEnum" max="0x05"/>
       <otherwiseConform>
         <provisionalConform/>
         <mandatoryConform/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 01ccc123644..27acca8e5a4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -34,7 +34,7 @@ limitations under the License.
         <typeName>Root Node</typeName>
         <profileId editable="false">0x0103</profileId>
         <deviceId editable="false">0x0016</deviceId>
-        <revision editable="false">4</revision>
+        <revision editable="false">5</revision>
         <class>Node</class>
         <scope>Node</scope>
         <clusters lockOthers="true">
@@ -217,7 +217,7 @@ limitations under the License.
         <typeName>On/Off Light</typeName>
         <profileId editable="false">0x0103</profileId>
         <deviceId editable="false">0x0100</deviceId>
-        <revision editable="false">3</revision>
+        <revision editable="false">4</revision>
         <class>Simple</class>
         <scope>Endpoint</scope>
         <clusters lockOthers="true">
diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
index d7202802f67..8779fc93709 100644
--- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2023-2025 Project CHIP Authors
+Copyright (c) 2023-2026 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,9 +17,9 @@ limitations under the License.
 <!--
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/app_clusters/SmokeCOAlarm.adoc
-Parameters: zap attribute=in-progress ignore-errored provisional-policy=loose sdkRoot=./connectedhomeip/ specRoot=./connectedhomeip-spec/ ./connectedhomeip-spec/src/app_clusters/SmokeCOAlarm.adoc 
-Git: 1.5-base-201-g537df4f4c
-Alchemy: v1.6.4
+Parameters: zap attribute=in-progress ignore-errored provisional-policy=loose sdkRoot=./connectedhomeip specRoot=./connectedhomeip-spec/ ./connectedhomeip-spec/src/app_clusters/SmokeCOAlarm.adoc
+Git: 0.9-summer2026
+Alchemy: v1.6.9
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
@@ -35,7 +35,7 @@ Alchemy: v1.6.4
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
     <!-- Current cluster version -->
-    <globalAttribute side="either" code="0xFFFD" value="1"/>
+    <globalAttribute side="either" code="0xFFFD" value="2"/>
     <!-- Cluster feature map -->
     <features>
       <feature bit="0" code="SMOKE" name="SmokeAlarm" summary="Supports Smoke alarm">
@@ -46,7 +46,7 @@ Alchemy: v1.6.4
       </feature>
     </features>
     <!-- Attributes -->
-    <attribute side="server" code="0x0000" name="ExpressedState" define="EXPRESSED_STATE" type="ExpressedStateEnum" max="0x08"/>
+    <attribute side="server" code="0x0000" name="ExpressedState" define="EXPRESSED_STATE" type="ExpressedStateEnum" max="0x09"/>
     <attribute side="server" code="0x0001" name="SmokeState" define="SMOKE_STATE" type="AlarmStateEnum" optional="true" max="0x02">
       <mandatoryConform>
         <feature name="SMOKE"/>
@@ -84,6 +84,21 @@ Alchemy: v1.6.4
     <attribute side="server" code="0x000C" name="ExpiryDate" define="EXPIRY_DATE" type="epoch_s" optional="true">
       <optionalConform/>
     </attribute>
+    <attribute side="server" code="0x000D" name="Unmounted" define="UNMOUNTED" type="boolean" optional="true" apiMaturity="provisional" default="0">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <greaterOrEqualTerm>
+            <revision value="current"/>
+            <revision value="2"/>
+          </greaterOrEqualTerm>
+        </optionalConform>
+      </otherwiseConform>
+      <greaterOrEqualTerm>
+        <revision value="current"/>
+        <revision value="2"/>
+      </greaterOrEqualTerm>
+    </attribute>
     <!-- Commands -->
     <command source="client" code="0x00" name="SelfTestRequest" optional="true">
       <description>This command SHALL initiate a device self-test.</description>
@@ -93,7 +108,7 @@ Alchemy: v1.6.4
     <!-- Events -->
     <event side="server" code="0x00" name="SmokeAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when SmokeState attribute changes to either Warning or Critical state.</description>
-      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
+      <field id="0" fieldId="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
       <mandatoryConform>
         <feature name="SMOKE"/>
       </mandatoryConform>
@@ -101,7 +116,7 @@ Alchemy: v1.6.4
 
     <event side="server" code="0x01" name="COAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when COState attribute changes to either Warning or Critical state.</description>
-      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
+      <field id="0" fieldId="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
       <mandatoryConform>
         <feature name="CO"/>
       </mandatoryConform>
@@ -109,7 +124,7 @@ Alchemy: v1.6.4
 
     <event side="server" code="0x02" name="LowBattery" priority="info">
       <description>This event SHALL be generated when BatteryAlert attribute changes to either Warning or Critical state.</description>
-      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
+      <field id="0" fieldId="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
     </event>
 
     <event side="server" code="0x03" name="HardwareFault" priority="info">
@@ -136,7 +151,7 @@ Alchemy: v1.6.4
 
     <event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor.</description>
-      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
+      <field id="0" fieldId="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
       <optionalConform>
         <feature name="SMOKE"/>
       </optionalConform>
@@ -144,7 +159,7 @@ Alchemy: v1.6.4
 
     <event side="server" code="0x09" name="InterconnectCOAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when the device hosting the server receives a CO alarm from an interconnected sensor.</description>
-      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
+      <field id="0" fieldId="0" name="AlarmSeverityLevel" type="AlarmStateEnum" max="0x02"/>
       <optionalConform>
         <feature name="CO"/>
       </optionalConform>
@@ -182,6 +197,7 @@ Alchemy: v1.6.4
     <item value="6" name="EndOfService"/>
     <item value="7" name="InterconnectSmoke"/>
     <item value="8" name="InterconnectCO"/>
+    <item value="9" name="Inoperative"/>
   </enum>
 
   <enum name="MuteStateEnum" type="enum8">
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 0665b19964a..d83ca9dec12 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -181,7 +181,7 @@
             "AdminFabricIndex",
             "AdminVendorId"
         ],
-        "Ambient Context Sensing": ["HoldTimeLimits"],
+        "Ambient Context Sensing": ["HoldTimeLimits", "ObjectCountConfig"],
         "Basic Information": [
             "FeatureMap",
             "ClusterRevision",
@@ -422,6 +422,11 @@
             "global_struct",
             "nullable_global_struct"
         ],
+        "Temperature Measurement": [
+            "ClusterRevision",
+            "FeatureMap",
+            "MeasuredValue"
+        ],
         "Thread Border Router Management": [
             "BorderRouterName",
             "BorderAgentID",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index a68ed02d282..7e26ae0fcb4 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -180,7 +180,7 @@
             "AdminFabricIndex",
             "AdminVendorId"
         ],
-        "Ambient Context Sensing": ["HoldTimeLimits"],
+        "Ambient Context Sensing": ["HoldTimeLimits", "ObjectCountConfig"],
         "Basic Information": [
             "FeatureMap",
             "ClusterRevision",
@@ -422,6 +422,11 @@
             "nullable_global_struct"
         ],
         "User Label": ["LabelList", "ClusterRevision", "FeatureMap"],
+        "Temperature Measurement": [
+            "ClusterRevision",
+            "FeatureMap",
+            "MeasuredValue"
+        ],
         "Thread Border Router Management": [
             "BorderRouterName",
             "BorderAgentID",
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 7af99d42bae..050e676e679 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -324,7 +324,7 @@
         "SWITCH_CLUSTER": ["switch-server"],
         "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"],
         "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"],
-        "TEMPERATURE_MEASUREMENT_CLUSTER": [],
+        "TEMPERATURE_MEASUREMENT_CLUSTER": ["temperature-measurement-server"],
         "THERMOSTAT_CLUSTER": ["thermostat-server"],
         "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [
             "thermostat-user-interface-configuration-server"
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index 7fa021795f6..9cb4b57693f 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -787,6 +787,11 @@ void AutoCommissioner::CleanupCommissioning()
     mOperationalDeviceProxy  = OperationalDeviceProxy();
     mDeviceCommissioningInfo = ReadCommissioningInfo();
     mNeedsDST                = false;
+    mNeedsNetworkSetup       = false;
+    mNeedIcdRegistration     = false;
+    mStopCommissioning       = false;
+    mAttestationElementsLen  = 0;
+    mAttestationSignatureLen = 0;
 }
 
 CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, CommissioningDelegate::CommissioningReport report)
diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn
index 0636935fcb9..ee7d0948a53 100644
--- a/src/controller/BUILD.gn
+++ b/src/controller/BUILD.gn
@@ -15,6 +15,7 @@
 import("//build_overrides/chip.gni")
 import("${chip_root}/src/app/common_flags.gni")
 import("${chip_root}/src/controller/flags.gni")
+import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/device.gni")
 
@@ -123,5 +124,16 @@ static_library("controller") {
     public_deps += [ "${chip_root}/src/controller/webrtc:chip_webrtc" ]
   }
 
+  if (chip_device_platform == "linux" && chip_crypto != "mbedtls" &&
+      chip_support_thread_meshcop && current_cpu == host_cpu &&
+      current_os == host_os) {
+    sources += [
+      "ThreadMeshcopCommissionProxy.cpp",
+      "ThreadMeshcopCommissionProxy.h",
+    ]
+    deps += [ "${chip_root}/src/lib/dnssd/minimal_mdns:minimal_mdns" ]
+    public_deps += [ "${chip_root}/third_party/ot-commissioner" ]
+  }
+
   public_configs = [ "${chip_root}/src:includes" ]
 }
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index c1d8c2765b2..513d751d4e4 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -703,10 +703,56 @@ CHIP_ERROR DeviceCommissioner::PairDevice(NodeId remoteDeviceId, RendezvousParam
     return errorCode;
 }
 
+#if CHIP_SUPPORT_THREAD_MESHCOP
+CHIP_ERROR DeviceCommissioner::PairThreadMeshcop(RendezvousParameters & rendezvousParams,
+                                                 CommissioningParameters & commissioningParams)
+{
+    VerifyOrReturnError(rendezvousParams.GetSetupDiscriminator().has_value(), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(commissioningParams.GetThreadOperationalDataset().HasValue(), CHIP_ERROR_INVALID_ARGUMENT);
+    auto discriminator = rendezvousParams.GetSetupDiscriminator().value();
+    Thread::DiscoveryCode code;
+    if (rendezvousParams.GetSetupDiscriminator().value().IsShortDiscriminator())
+    {
+        code = Thread::DiscoveryCode(discriminator.GetShortValue());
+        ChipLogProgress(Controller, "Discovery code from short discriminator: 0x%" PRIx64, code.AsUInt64());
+    }
+    else
+    {
+        code = Thread::DiscoveryCode(discriminator.GetLongValue());
+        ChipLogProgress(Controller, "Discovery code from long discriminator: 0x%" PRIx64, code.AsUInt64());
+    }
+
+    uint8_t pskcBuffer[Thread::kSizePSKc];
+    ByteSpan pskc(pskcBuffer);
+    {
+        Thread::OperationalDatasetView dataset;
+        ReturnErrorOnFailure(dataset.Init(commissioningParams.GetThreadOperationalDataset().Value()));
+
+        ReturnErrorOnFailure(dataset.GetPSKc(pskcBuffer));
+    }
+
+    {
+        Dnssd::DiscoveredNodeData discoveredNodeData;
+        ReturnErrorOnFailure(mThreadMeshcopCommissionProxy.Discover(pskc, rendezvousParams.GetPeerAddress(), code, discriminator,
+                                                                    discoveredNodeData, 30));
+
+        ChipLogProgress(Controller, "Joiner discovered");
+        OnNodeDiscovered(discoveredNodeData);
+    }
+    return CHIP_NO_ERROR;
+}
+#endif // CHIP_SUPPORT_THREAD_MESHCOP
+
 CHIP_ERROR DeviceCommissioner::PairDevice(NodeId remoteDeviceId, RendezvousParameters & rendezvousParams,
                                           CommissioningParameters & commissioningParams)
 {
     MATTER_TRACE_SCOPE("PairDevice", "DeviceCommissioner");
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    if (rendezvousParams.GetPeerAddress().GetTransportType() == Transport::Type::kThreadMeshcop)
+    {
+        return PairThreadMeshcop(rendezvousParams, commissioningParams);
+    }
+#endif
     ReturnErrorOnFailureWithMetric(kMetricDeviceCommissionerCommission, EstablishPASEConnection(remoteDeviceId, rendezvousParams));
     auto errorCode = Commission(remoteDeviceId, commissioningParams);
     VerifyOrDoWithMetric(kMetricDeviceCommissionerCommission, CHIP_NO_ERROR == errorCode, errorCode);
@@ -1228,7 +1274,7 @@ void DeviceCommissioner::OnSessionEstablished(const SessionHandle & session)
     CHIP_ERROR err = device->SetConnected(session);
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogFailure(err, Controller, "Failed in setting up secure channel");
+        ChipLogError(Controller, "Failed in setting up secure channel: %" CHIP_ERROR_FORMAT, err.Format());
         OnSessionEstablishmentError(err);
         return;
     }
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index f516257057d..ba246e966ca 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -76,6 +76,10 @@
 #endif
 #include <controller/DeviceDiscoveryDelegate.h>
 
+#if CHIP_SUPPORT_THREAD_MESHCOP
+#include <controller/ThreadMeshcopCommissionProxy.h>
+#endif
+
 namespace chip {
 
 namespace Controller {
@@ -1137,6 +1141,10 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
 
     bool IsAttestationInformationMissing(const CommissioningParameters & params);
 
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    CHIP_ERROR PairThreadMeshcop(RendezvousParameters & rendezvousParams, CommissioningParameters & commissioningParams);
+#endif
+
     chip::Callback::Callback<OnDeviceConnected> mOnDeviceConnectedCallback;
     chip::Callback::Callback<OnDeviceConnectionFailure> mOnDeviceConnectionFailureCallback;
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
@@ -1162,6 +1170,10 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
     Optional<Crypto::P256PublicKey> mTrustedIcacPublicKeyB;
     EndpointId mPeerAdminJFAdminClusterEndpointId = kInvalidEndpointId;
 #endif
+
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    ThreadMeshcopCommissionProxy mThreadMeshcopCommissionProxy;
+#endif
 };
 
 } // namespace Controller
diff --git a/examples/chip-tool/commands/pairing/CommissionProxy.cpp b/src/controller/ThreadMeshcopCommissionProxy.cpp
similarity index 67%
rename from examples/chip-tool/commands/pairing/CommissionProxy.cpp
rename to src/controller/ThreadMeshcopCommissionProxy.cpp
index 9e4b827648b..fe89154ba77 100644
--- a/examples/chip-tool/commands/pairing/CommissionProxy.cpp
+++ b/src/controller/ThreadMeshcopCommissionProxy.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "CommissionProxy.h"
+#include "ThreadMeshcopCommissionProxy.h"
 
 #include <lib/core/CHIPEncoding.h>
 #include <lib/dnssd/TxtFields.h>
@@ -26,7 +26,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <transport/raw/MessageHeader.h>
 
-#include <error.h>
+#include <errno.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -46,7 +46,7 @@ class CommissionerLogger : public ot::commissioner::Logger
 public:
     void Log(ot::commissioner::LogLevel level, const std::string & region, const std::string & message) override
     {
-        ChipLogProgress(chipTool, "[ot-commissioner][%u][%s] %s", static_cast<unsigned>(level), region.c_str(), message.c_str());
+        ChipLogProgress(Controller, "[ot-commissioner][%u][%s] %s", static_cast<unsigned>(level), region.c_str(), message.c_str());
     }
 };
 
@@ -66,12 +66,15 @@ std::vector<uint8_t> DiscoveryCodeToVector(Thread::DiscoveryCode code)
 }
 } // namespace
 
-CommissionProxy::CommissionProxy() : mState(State::kConnecting), mPromiseFulfilled(false)
+namespace chip {
+namespace Controller {
+
+ThreadMeshcopCommissionProxy::ThreadMeshcopCommissionProxy() : mState(State::kConnecting), mPromiseFulfilled(false)
 {
     mCommissioner = ot::commissioner::Commissioner::Create(*this);
 }
 
-CommissionProxy::~CommissionProxy()
+ThreadMeshcopCommissionProxy::~ThreadMeshcopCommissionProxy()
 {
     if (mProxyFd != -1)
     {
@@ -85,29 +88,29 @@ CommissionProxy::~CommissionProxy()
     }
 }
 
-void CommissionProxy::SetState(State state)
+void ThreadMeshcopCommissionProxy::SetState(State state)
 {
     mState = state;
 }
 
-void CommissionProxy::OnHeader(mdns::Minimal::ConstHeaderRef & header)
+void ThreadMeshcopCommissionProxy::OnHeader(mdns::Minimal::ConstHeaderRef & header)
 {
-    ChipLogDetail(chipTool, "mDNS Response: ID=%u, Answers=%u, Additional=%u", header.GetMessageId(), header.GetAnswerCount(),
+    ChipLogDetail(Controller, "mDNS Response: ID=%u, Answers=%u, Additional=%u", header.GetMessageId(), header.GetAnswerCount(),
                   header.GetAdditionalCount());
 }
 
-void CommissionProxy::OnQuery(const mdns::Minimal::QueryData & data)
+void ThreadMeshcopCommissionProxy::OnQuery(const mdns::Minimal::QueryData & data)
 {
     if (mState != State::kDiscovering)
     {
-        ChipLogProgress(chipTool, "Received mDNS query but proxy is not in discovery state");
+        ChipLogProgress(Controller, "Received mDNS query but proxy is not in discovery state");
     }
 
-    ChipLogDetail(chipTool, "mDNS query: %s", mdns::Minimal::QNameString(data.GetName()).c_str());
+    ChipLogDetail(Controller, "mDNS query: %s", mdns::Minimal::QNameString(data.GetName()).c_str());
     mNodeData.Set<Dnssd::CommissionNodeData>();
 }
 
-void CommissionProxy::OnResource(mdns::Minimal::ResourceType section, const mdns::Minimal::ResourceData & data)
+void ThreadMeshcopCommissionProxy::OnResource(mdns::Minimal::ResourceType section, const mdns::Minimal::ResourceData & data)
 {
     if (mState != State::kDiscovering)
     {
@@ -130,13 +133,13 @@ void CommissionProxy::OnResource(mdns::Minimal::ResourceType section, const mdns
         mdns::Minimal::SrvRecord srv;
         if (!srv.Parse(data.GetData(), mDnsPacket))
         {
-            ChipLogError(chipTool, "Failed to parse mDNS SRV record");
+            ChipLogError(Controller, "Failed to parse mDNS SRV record");
             return;
         }
 
         if (!name.EndsWith(kMatterCServiceSuffix))
         {
-            ChipLogDetail(chipTool, "Ignoring non-Matter service: %s", name.c_str());
+            ChipLogDetail(Controller, "Ignoring non-Matter service: %s", name.c_str());
             return;
         }
 
@@ -156,7 +159,7 @@ void CommissionProxy::OnResource(mdns::Minimal::ResourceType section, const mdns
             CHIP_ERROR err = CreateProxySocket(commissionData);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(chipTool, "Failed to setup proxy socket: %" CHIP_ERROR_FORMAT, err.Format());
+                ChipLogError(Controller, "Failed to setup proxy socket: %" CHIP_ERROR_FORMAT, err.Format());
                 SetState(State::kAborted);
             }
         }
@@ -172,7 +175,7 @@ void CommissionProxy::OnResource(mdns::Minimal::ResourceType section, const mdns
     }
 }
 
-CHIP_ERROR CommissionProxy::CreateProxySocket(chip::Dnssd::CommissionNodeData & commissionData)
+CHIP_ERROR ThreadMeshcopCommissionProxy::CreateProxySocket(chip::Dnssd::CommissionNodeData & commissionData)
 {
     mProxyFd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
     VerifyOrReturnError(mProxyFd >= 0, CHIP_ERROR_POSIX(errno));
@@ -202,11 +205,11 @@ CHIP_ERROR CommissionProxy::CreateProxySocket(chip::Dnssd::CommissionNodeData &
     commissionData.ipAddress[0] = Inet::IPAddress::FromSockAddr(addr);
     commissionData.interfaceId  = Inet::InterfaceId::FromIPAddress(commissionData.ipAddress[0]);
 
-    ChipLogProgress(chipTool, "Proxy socket created on port %u", commissionData.port);
+    ChipLogProgress(Controller, "Proxy socket created on port %u", commissionData.port);
     return CHIP_NO_ERROR;
 }
 
-void CommissionProxy::OnRecord(const mdns::Minimal::BytesRange & name, const mdns::Minimal::BytesRange & value)
+void ThreadMeshcopCommissionProxy::OnRecord(const mdns::Minimal::BytesRange & name, const mdns::Minimal::BytesRange & value)
 {
     ByteSpan key(name.Start(), name.Size());
     ByteSpan val(value.Start(), value.Size());
@@ -214,8 +217,8 @@ void CommissionProxy::OnRecord(const mdns::Minimal::BytesRange & name, const mdn
     Dnssd::FillNodeDataFromTxt(key, val, mNodeData.Get<Dnssd::CommissionNodeData>());
 }
 
-void CommissionProxy::ProcessAnnouncement(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort,
-                                          const std::vector<uint8_t> & payload)
+void ThreadMeshcopCommissionProxy::ProcessAnnouncement(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort,
+                                                       const std::vector<uint8_t> & payload)
 {
     std::lock_guard<std::recursive_mutex> lock(mMutex);
 
@@ -229,16 +232,16 @@ void CommissionProxy::ProcessAnnouncement(const std::vector<uint8_t> & joinerIdB
 
     if (!mdns::Minimal::ParsePacket(mDnsPacket, this))
     {
-        ChipLogError(chipTool, "Failed to parse joiner mDNS announcement");
+        ChipLogError(Controller, "Failed to parse joiner mDNS announcement");
         return;
     }
 
     uint32_t discoveredDiscriminator = mNodeData.Get<Dnssd::CommissionNodeData>().longDiscriminator;
-    ChipLogProgress(chipTool, "Discovered joiner with discriminator: %u", discoveredDiscriminator);
+    ChipLogProgress(Controller, "Discovered joiner with discriminator: %u", discoveredDiscriminator);
 
     if (!mExpectedDiscriminator.MatchesLongDiscriminator(static_cast<uint16_t>(discoveredDiscriminator)))
     {
-        ChipLogProgress(chipTool, "Discriminator mismatch (Expected %u, Got %u). Ignoring announcement.",
+        ChipLogProgress(Controller, "Discriminator mismatch (Expected %u, Got %u). Ignoring announcement.",
                         mExpectedDiscriminator.GetLongValue(), discoveredDiscriminator);
         return;
     }
@@ -267,7 +270,7 @@ void CommissionProxy::ProcessAnnouncement(const std::vector<uint8_t> & joinerIdB
                 int rval = connect(mProxyFd, reinterpret_cast<struct sockaddr *>(&addr), len);
                 if (rval < 0)
                 {
-                    ChipLogError(chipTool, "Failed to connect to Matter Commissioner: %s", strerror(errno));
+                    ChipLogError(Controller, "Failed to connect to Matter Commissioner: %s", strerror(errno));
                     continue;
                 }
                 SetState(State::kCommissioning);
@@ -280,21 +283,21 @@ void CommissionProxy::ProcessAnnouncement(const std::vector<uint8_t> & joinerIdB
                 auto error = mCommissioner->SendToJoiner(id, mServicePort, pkt);
                 if (error != ot::commissioner::ErrorCode::kNone)
                 {
-                    ChipLogError(chipTool, "Failed to send packet to joiner: %s", error.GetMessage().c_str());
+                    ChipLogError(Controller, "Failed to send packet to joiner: %s", error.GetMessage().c_str());
                     return;
                 }
                 break;
             }
             default:
-                ChipLogError(chipTool, "Invalid CommissionProxy state: %d", static_cast<int>(mState.load()));
+                ChipLogError(Controller, "Invalid CommissionProxy state: %d", static_cast<int>(mState.load()));
                 return;
             }
         }
     });
 }
 
-void CommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort,
-                                      const std::vector<uint8_t> & payload)
+void ThreadMeshcopCommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort,
+                                                   const std::vector<uint8_t> & payload)
 {
     std::lock_guard<std::recursive_mutex> lock(mMutex);
 
@@ -304,7 +307,7 @@ void CommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes
     }
 
     uint64_t joinerId = JoinerIdFromBytes(joinerIdBytes);
-    ChipLogDetail(chipTool, "Message from joiner 0x%" PRIx64 " on port %u", joinerId, joinerPort);
+    ChipLogDetail(Controller, "Message from joiner 0x%" PRIx64 " on port %u", joinerId, joinerPort);
 
     if (mJoinerId == 0)
     {
@@ -312,7 +315,7 @@ void CommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes
     }
     else if (mJoinerId != joinerId)
     {
-        ChipLogProgress(chipTool, "Ignoring message from unexpected joiner 0x%" PRIx64, joinerId);
+        ChipLogProgress(Controller, "Ignoring message from unexpected joiner 0x%" PRIx64, joinerId);
         return;
     }
 
@@ -323,7 +326,7 @@ void CommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes
         {
             if (send(mProxyFd, payload.data(), payload.size(), 0) < 0)
             {
-                ChipLogError(chipTool, "Failed to forward packet to local proxy: %s", strerror(errno));
+                ChipLogError(Controller, "Failed to forward packet to local proxy: %s", strerror(errno));
                 SetState(State::kAborted);
             }
         }
@@ -338,12 +341,12 @@ void CommissionProxy::OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes
         ProcessAnnouncement(joinerIdBytes, joinerPort, payload);
         break;
     case State::kDiscovered:
-        ChipLogProgress(chipTool, "WARNING ignore unsolicited messages after joiner is already discovered");
+        ChipLogProgress(Controller, "WARNING ignore unsolicited messages after joiner is already discovered");
         break;
     }
 }
 
-ot::commissioner::CommissionerDataset CommissionProxy::MakeCommissionerDataset(Thread::DiscoveryCode code)
+ot::commissioner::CommissionerDataset ThreadMeshcopCommissionProxy::MakeCommissionerDataset(Thread::DiscoveryCode code)
 {
     ot::commissioner::CommissionerDataset dataset;
 
@@ -366,29 +369,32 @@ ot::commissioner::CommissionerDataset CommissionProxy::MakeCommissionerDataset(T
     dataset.mPresentFlags |= ot::commissioner::CommissionerDataset::kSteeringDataBit;
     return dataset;
 }
-CHIP_ERROR CommissionProxy::InitializeCommissioner(uint8_t (&pskc)[Thread::kSizePSKc])
+CHIP_ERROR ThreadMeshcopCommissionProxy::InitializeCommissioner(ByteSpan & pskc)
 {
+    VerifyOrReturnError(pskc.size() == Thread::kSizePSKc, CHIP_ERROR_INVALID_ARGUMENT);
     ot::commissioner::Config config;
     config.mLogger    = std::make_shared<CommissionerLogger>();
     config.mEnableCcm = false;
     config.mProxyMode = true;
-    config.mPSKc      = std::vector<uint8_t>(pskc, pskc + Thread::kSizePSKc);
+    config.mPSKc      = std::vector<uint8_t>(pskc.begin(), pskc.end());
 
     auto error = mCommissioner->Init(config);
     if (error != ot::commissioner::ErrorCode::kNone)
     {
-        ChipLogError(chipTool, "OT Commissioner Init failed: %s", error.GetMessage().c_str());
+        ChipLogError(Controller, "OT Commissioner Init failed: %s", error.GetMessage().c_str());
         return CHIP_ERROR_INTERNAL;
     }
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR CommissionProxy::Discover(uint8_t (&pskc)[Thread::kSizePSKc], const char * host, uint16_t port,
+CHIP_ERROR ThreadMeshcopCommissionProxy::Discover(ByteSpan & pskc, const Transport::PeerAddress & peerAddr,
+                                                  const Thread::DiscoveryCode code, SetupDiscriminator expectedDiscriminator,
+                                                  Dnssd::DiscoveredNodeData & nodeData, uint16_t timeout)
+{
+    using ot::commissioner::Error;
 
-                                     const Thread::DiscoveryCode code, SetupDiscriminator expectedDiscriminator,
+    Error error;
 
-                                     Dnssd::DiscoveredNodeData & nodeData, uint16_t timeout)
-{
     // Reset the promise and state for a new discovery session
     std::future<Dnssd::DiscoveredNodeData> future;
     {
@@ -403,34 +409,41 @@ CHIP_ERROR CommissionProxy::Discover(uint8_t (&pskc)[Thread::kSizePSKc], const c
 
     ReturnErrorOnFailure(InitializeCommissioner(pskc));
 
-    ChipLogProgress(chipTool, "Petitioning Thread Border Agent at %s:%u", host, port);
-    std::string id;
-    auto error = mCommissioner->Petition(id, std::string(host), port);
-    if (error != ot::commissioner::ErrorCode::kNone)
     {
-        ChipLogError(chipTool, "Petition failed: %s", error.GetMessage().c_str());
-        SetState(State::kAborted);
-        return CHIP_ERROR_INTERNAL;
-    }
+        std::string id;
+        char host[Inet::IPAddress::kMaxStringLength];
+        peerAddr.GetIPAddress().ToString(host);
 
-    ChipLogProgress(chipTool, "Thread Commissioner active with ID: %s", id.c_str());
+        ChipLogProgress(Controller, "Petitioning Thread Border Agent at %s:%u", host, peerAddr.GetPort());
+        error = mCommissioner->Petition(id, std::string(host), peerAddr.GetPort());
+        if (error != ot::commissioner::ErrorCode::kNone)
+        {
+            ChipLogError(Controller, "Petition failed: %s", error.GetMessage().c_str());
+            SetState(State::kAborted);
+            return CHIP_ERROR_INTERNAL;
+        }
+
+        ChipLogProgress(Controller, "Thread Commissioner active with ID: %s", id.c_str());
+    }
 
     error = mCommissioner->SetCommissionerDataset(MakeCommissionerDataset(code));
     if (error != ot::commissioner::ErrorCode::kNone)
     {
-        ChipLogError(chipTool, "Failed to set Steering Data: %s", error.GetMessage().c_str());
+        ChipLogError(Controller, "Failed to set Steering Data: %s", error.GetMessage().c_str());
         SetState(State::kAborted);
         return CHIP_ERROR_INTERNAL;
     }
 
-    ChipLogProgress(chipTool, "Waiting for mDNS announcement from joiner...");
+    ChipLogProgress(Controller, "Waiting for mDNS announcement from joiner...");
     auto waitDuration = std::chrono::seconds(timeout);
     if (future.wait_for(waitDuration) == std::future_status::timeout)
     {
-        ChipLogError(chipTool, "Timed out waiting for joiner mDNS announcement after %u seconds", timeout);
+        ChipLogError(Controller, "Timed out waiting for joiner mDNS announcement after %u seconds", timeout);
         SetState(State::kAborted);
         return CHIP_ERROR_TIMEOUT;
     }
     nodeData = future.get();
     return CHIP_NO_ERROR;
 }
+} // namespace Controller
+} // namespace chip
diff --git a/examples/chip-tool/commands/pairing/CommissionProxy.h b/src/controller/ThreadMeshcopCommissionProxy.h
similarity index 77%
rename from examples/chip-tool/commands/pairing/CommissionProxy.h
rename to src/controller/ThreadMeshcopCommissionProxy.h
index aec81de8e1e..799e48bde68 100644
--- a/examples/chip-tool/commands/pairing/CommissionProxy.h
+++ b/src/controller/ThreadMeshcopCommissionProxy.h
@@ -34,17 +34,20 @@
 #include <lib/support/SetupDiscriminator.h>
 #include <lib/support/ThreadDiscoveryCode.h>
 #include <lib/support/ThreadOperationalDataset.h>
+#include <transport/raw/PeerAddress.h>
 
-#include "../third_party/ot-commissioner/repo/include/commissioner/commissioner.hpp"
+#include <commissioner/commissioner.hpp>
 
+namespace chip {
+namespace Controller {
 /**
  * CommissionProxy acts as a bridge between the OpenThread Commissioner and Matter commissioning.
  * It handles Thread-specific commissioning (MeshCoP) and proxies mDNS discovery data
  * to facilitate the transition into Matter's operational commissioning flow.
  */
-class CommissionProxy : public ot::commissioner::CommissionerHandler,
-                        public mdns::Minimal::ParserDelegate,
-                        public mdns::Minimal::TxtRecordDelegate
+class ThreadMeshcopCommissionProxy : public ot::commissioner::CommissionerHandler,
+                                     public mdns::Minimal::ParserDelegate,
+                                     public mdns::Minimal::TxtRecordDelegate
 {
 public:
     enum class State
@@ -56,15 +59,14 @@ class CommissionProxy : public ot::commissioner::CommissionerHandler,
         kAborted,       // Error or user cancellation
     };
 
-    CommissionProxy();
-    ~CommissionProxy() override;
+    ThreadMeshcopCommissionProxy();
+    ~ThreadMeshcopCommissionProxy() override;
 
     /**
      * Entry point to start the Thread commissioning and discover the device.
      */
-    CHIP_ERROR Discover(uint8_t (&pskc)[chip::Thread::kSizePSKc], const char * host, uint16_t port,
-                        const chip::Thread::DiscoveryCode code, chip::SetupDiscriminator expectedDiscriminator,
-                        chip::Dnssd::DiscoveredNodeData & nodeData, uint16_t timeout);
+    CHIP_ERROR Discover(ByteSpan & pskc, const Transport::PeerAddress & peerAddr, const Thread::DiscoveryCode code,
+                        chip::SetupDiscriminator expectedDiscriminator, Dnssd::DiscoveredNodeData & nodeData, uint16_t timeout);
 
     // ot::commissioner::CommissionerHandler
     void OnJoinerMessage(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort,
@@ -80,12 +82,12 @@ class CommissionProxy : public ot::commissioner::CommissionerHandler,
 
 private:
     // Internal Helper Methods
-    CHIP_ERROR InitializeCommissioner(uint8_t (&pskc)[chip::Thread::kSizePSKc]);
-    CHIP_ERROR CreateProxySocket(chip::Dnssd::CommissionNodeData & commissionData);
+    CHIP_ERROR InitializeCommissioner(ByteSpan & pskc);
+    CHIP_ERROR CreateProxySocket(Dnssd::CommissionNodeData & commissionData);
     void ProcessAnnouncement(const std::vector<uint8_t> & joinerIdBytes, uint16_t joinerPort, const std::vector<uint8_t> & payload);
     void SetState(State state);
 
-    ot::commissioner::CommissionerDataset MakeCommissionerDataset(chip::Thread::DiscoveryCode code);
+    ot::commissioner::CommissionerDataset MakeCommissionerDataset(Thread::DiscoveryCode code);
 
     // Member Variables
     chip::Dnssd::DiscoveredNodeData mNodeData;
@@ -100,8 +102,11 @@ class CommissionProxy : public ot::commissioner::CommissionerHandler,
 
     std::recursive_mutex mMutex;
     bool mPromiseFulfilled = false;
-    std::promise<chip::Dnssd::DiscoveredNodeData> mDiscoveredNodePromise;
+    std::promise<Dnssd::DiscoveredNodeData> mDiscoveredNodePromise;
 
     std::shared_ptr<ot::commissioner::Commissioner> mCommissioner;
     std::thread mProxyThread;
 };
+
+} // namespace Controller
+} // namespace chip
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 9343629857d..e4521400dda 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2042,7 +2042,6 @@ cluster GeneralDiagnostics = 51 {
 
   bitmap Feature : bitmap32 {
     kDataModelTest = 0x1;
-    kDeviceLoad = 0x2;
   }
 
   struct DeviceLoadStruct {
@@ -2948,7 +2947,12 @@ cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 cluster GroupKeyManagement = 63 {
-  revision 2;
+  revision 3;
+
+  enum GroupKeyMulticastPolicyEnum : enum8 {
+    kPerGroupID = 0;
+    kAllNodes = 1;
+  }
 
   enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
@@ -2957,6 +2961,7 @@ cluster GroupKeyManagement = 63 {
 
   bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
+    kGroupcast = 0x2;
   }
 
   fabric_scoped struct GroupInfoMapStruct {
@@ -2981,12 +2986,19 @@ cluster GroupKeyManagement = 63 {
     nullable epoch_us epochStartTime1 = 5;
     nullable octet_string<16> epochKey2 = 6;
     nullable epoch_us epochStartTime2 = 7;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
+  }
+
+  fabric_scoped struct GroupcastAdoptionStruct {
+    boolean groupcastAdopted = 0;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(read: administer, write: administer) optional GroupcastAdoptionStruct groupcastAdoption[] = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3013,13 +3025,13 @@ cluster GroupKeyManagement = 63 {
     int16u groupKeySetIDs[] = 0;
   }
 
-  /** Write a new set of keys for the given key set id. */
+  /** This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys. */
   fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  /** Read the keys for a given key set id. */
+  /** This command is used by Administrators to read the state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  /** Revoke a Root Key from a Group */
+  /** This command is used by Administrators to remove all state of a given Group Key Set. */
   fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  /** Return the list of Group Key Sets associated with the accessing fabric */
+  /** This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric. */
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
@@ -3835,7 +3847,7 @@ cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 cluster SmokeCoAlarm = 92 {
-  revision 1;
+  revision 2;
 
   enum AlarmStateEnum : enum8 {
     kNormal = 0;
@@ -3865,6 +3877,7 @@ cluster SmokeCoAlarm = 92 {
     kEndOfService = 6;
     kInterconnectSmoke = 7;
     kInterconnectCO = 8;
+    kInoperative = 9;
   }
 
   enum MuteStateEnum : enum8 {
@@ -3934,6 +3947,7 @@ cluster SmokeCoAlarm = 92 {
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
   attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
+  provisional readonly attribute optional boolean unmounted = 13;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -4379,7 +4393,7 @@ provisional cluster ScenesManagement = 98 {
 }
 
 /** The Groupcast cluster manages the content of the node-wide multicast Group membership that is part of the underlying interaction layer. */
-cluster Groupcast = 101 {
+provisional cluster Groupcast = 101 {
   revision 1;
 
   enum GroupcastTestResultEnum : enum8 {
@@ -8756,7 +8770,7 @@ provisional cluster SoilMeasurement = 1072 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** This cluster provides data modeling and protocol implementation of ambient context sensing features. */
+/** This server cluster provides an interface to ambient context sensing functionality. */
 provisional cluster AmbientContextSensing = 1073 {
   revision 1;
 
@@ -8771,8 +8785,6 @@ provisional cluster AmbientContextSensing = 1073 {
   struct AmbientContextTypeStruct {
     SemanticTagStruct ambientContextSensed[] = 0;
     optional epoch_s detectionStartTime = 1;
-    optional int16u objectCountThreshold = 2;
-    optional int16u objectCount = 3;
   }
 
   struct HoldTimeLimitsStruct {
@@ -8781,6 +8793,11 @@ provisional cluster AmbientContextSensing = 1073 {
     int16u holdTimeDefault = 2;
   }
 
+  struct ObjectCountConfigStruct {
+    SemanticTagStruct countingObject = 0;
+    int16u objectCountThreshold = 1;
+  }
+
   struct PredictedActivityStruct {
     epoch_s startTimestamp = 0;
     epoch_s endTimestamp = 1;
@@ -8790,8 +8807,13 @@ provisional cluster AmbientContextSensing = 1073 {
     percent confidence = 5;
   }
 
-  info event AmbientContextDetected = 0 {
-    AmbientContextTypeStruct ambientContextType[] = 0;
+  info event AmbientContextDetectStarted = 0 {
+    optional AmbientContextTypeStruct ambientContextType[] = 0;
+    optional int16u objectCount = 1;
+  }
+
+  info event AmbientContextDetectEnded = 1 {
+    event_no startEventNumber = 0;
   }
 
   readonly attribute optional boolean humanActivityDetected = 0;
@@ -8799,11 +8821,13 @@ provisional cluster AmbientContextSensing = 1073 {
   readonly attribute optional boolean audioContextDetected = 2;
   readonly attribute optional AmbientContextTypeStruct ambientContextType[] = 3;
   readonly attribute optional SemanticTagStruct ambientContextTypeSupported[] = 4;
-  attribute int8u simultaneousDetectionLimit = 5;
-  readonly attribute optional boolean objectCountReached = 6;
-  attribute access(write: manage) int16u holdTime = 7;
-  readonly attribute HoldTimeLimitsStruct holdTimeLimits = 8;
-  readonly attribute access(write: manage) optional PredictedActivityStruct predictedActivity[] = 9;
+  readonly attribute optional boolean objectCountReached = 5;
+  attribute access(write: manage) optional ObjectCountConfigStruct objectCountConfig = 6;
+  readonly attribute optional int16u objectCount = 7;
+  attribute int8u simultaneousDetectionLimit = 8;
+  attribute access(write: manage) int16u holdTime = 9;
+  readonly attribute HoldTimeLimitsStruct holdTimeLimits = 10;
+  readonly attribute optional PredictedActivityStruct predictedActivity[] = 11;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 5eb8906465d..b7a13fbd4f2 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -54,7 +54,7 @@
         }
       ],
       "deviceVersions": [
-        1
+        5
       ],
       "deviceIdentifiers": [
         22
diff --git a/src/controller/flags.gni b/src/controller/flags.gni
index 03ca46dccf5..3fc43a118a3 100644
--- a/src/controller/flags.gni
+++ b/src/controller/flags.gni
@@ -13,6 +13,9 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/recommended.gni")
+import("${chip_root}/src/platform/device.gni")
+import("${chip_root}/src/system/system.gni")
 
 declare_args() {
   # Build controller (set to false for a device)
@@ -20,4 +23,10 @@ declare_args() {
 
   # Build controller with webrtc python bindings
   chip_support_webrtc_python_bindings = false
+
+  # Disable Thread MeshCoP if cross-compiling by default.
+  chip_support_thread_meshcop =
+      matter_enable_recommended && chip_device_platform == "linux" &&
+      !chip_system_config_use_openthread_inet_endpoints &&
+      current_cpu == host_cpu && current_os == host_os
 }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index 3a32f2fb5e3..ff3ade93823 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -15967,6 +15967,7 @@ public static class GroupKeyManagementCluster extends BaseChipCluster {
     private static final long GROUP_TABLE_ATTRIBUTE_ID = 1L;
     private static final long MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID = 2L;
     private static final long MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID = 3L;
+    private static final long GROUPCAST_ADOPTION_ATTRIBUTE_ID = 4L;
     private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
     private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
     private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
@@ -16095,6 +16096,10 @@ public interface GroupTableAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> value);
     }
 
+    public interface GroupcastAdoptionAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> value);
+    }
+
     public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Long> value);
     }
@@ -16230,6 +16235,46 @@ public void onSuccess(byte[] tlv) {
         }, MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
+    public void readGroupcastAdoptionAttribute(
+        GroupcastAdoptionAttributeCallback callback) {
+      readGroupcastAdoptionAttributeWithFabricFilter(callback, true);
+    }
+
+    public void readGroupcastAdoptionAttributeWithFabricFilter(
+        GroupcastAdoptionAttributeCallback callback, boolean isFabricFiltered) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUPCAST_ADOPTION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GROUPCAST_ADOPTION_ATTRIBUTE_ID, isFabricFiltered);
+    }
+
+    public void writeGroupcastAdoptionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> value) {
+      writeGroupcastAdoptionAttribute(callback, value, 0);
+    }
+
+    public void writeGroupcastAdoptionAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
+      writeAttribute(new WriteAttributesCallbackImpl(callback), GROUPCAST_ADOPTION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeGroupcastAdoptionAttribute(
+        GroupcastAdoptionAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GROUPCAST_ADOPTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, GROUPCAST_ADOPTION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
       ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
@@ -21976,6 +22021,7 @@ public static class SmokeCoAlarmCluster extends BaseChipCluster {
     private static final long CONTAMINATION_STATE_ATTRIBUTE_ID = 10L;
     private static final long SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID = 11L;
     private static final long EXPIRY_DATE_ATTRIBUTE_ID = 12L;
+    private static final long UNMOUNTED_ATTRIBUTE_ID = 13L;
     private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
     private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
     private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
@@ -22367,6 +22413,32 @@ public void onSuccess(byte[] tlv) {
         }, EXPIRY_DATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
+    public void readUnmountedAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNMOUNTED_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNMOUNTED_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeUnmountedAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNMOUNTED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, UNMOUNTED_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
     public void readGeneratedCommandListAttribute(
         GeneratedCommandListAttributeCallback callback) {
       ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
@@ -52001,11 +52073,13 @@ public static class AmbientContextSensingCluster extends BaseChipCluster {
     private static final long AUDIO_CONTEXT_DETECTED_ATTRIBUTE_ID = 2L;
     private static final long AMBIENT_CONTEXT_TYPE_ATTRIBUTE_ID = 3L;
     private static final long AMBIENT_CONTEXT_TYPE_SUPPORTED_ATTRIBUTE_ID = 4L;
-    private static final long SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID = 5L;
-    private static final long OBJECT_COUNT_REACHED_ATTRIBUTE_ID = 6L;
-    private static final long HOLD_TIME_ATTRIBUTE_ID = 7L;
-    private static final long HOLD_TIME_LIMITS_ATTRIBUTE_ID = 8L;
-    private static final long PREDICTED_ACTIVITY_ATTRIBUTE_ID = 9L;
+    private static final long OBJECT_COUNT_REACHED_ATTRIBUTE_ID = 5L;
+    private static final long OBJECT_COUNT_CONFIG_ATTRIBUTE_ID = 6L;
+    private static final long OBJECT_COUNT_ATTRIBUTE_ID = 7L;
+    private static final long SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID = 8L;
+    private static final long HOLD_TIME_ATTRIBUTE_ID = 9L;
+    private static final long HOLD_TIME_LIMITS_ATTRIBUTE_ID = 10L;
+    private static final long PREDICTED_ACTIVITY_ATTRIBUTE_ID = 11L;
     private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
     private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
     private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
@@ -52030,6 +52104,10 @@ public interface AmbientContextTypeSupportedAttributeCallback extends BaseAttrib
       void onSuccess(List<ChipStructs.AmbientContextSensingClusterSemanticTagStruct> value);
     }
 
+    public interface ObjectCountConfigAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value);
+    }
+
     public interface HoldTimeLimitsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.AmbientContextSensingClusterHoldTimeLimitsStruct value);
     }
@@ -52180,31 +52258,83 @@ public void onSuccess(byte[] tlv) {
         }, AMBIENT_CONTEXT_TYPE_SUPPORTED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readSimultaneousDetectionLimitAttribute(
-        IntegerAttributeCallback callback) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID);
+    public void readObjectCountReachedAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_REACHED_ATTRIBUTE_ID);
 
       readAttribute(new ReportCallbackImpl(callback, path) {
           @Override
           public void onSuccess(byte[] tlv) {
-            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
-        }, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, true);
+        }, OBJECT_COUNT_REACHED_ATTRIBUTE_ID, true);
     }
 
-    public void writeSimultaneousDetectionLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeSimultaneousDetectionLimitAttribute(callback, value, 0);
+    public void subscribeObjectCountReachedAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_REACHED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OBJECT_COUNT_REACHED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeSimultaneousDetectionLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      BaseTLVType tlvValue = new UIntType(value);
-      writeAttribute(new WriteAttributesCallbackImpl(callback), SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    public void readObjectCountConfigAttribute(
+        ObjectCountConfigAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_CONFIG_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OBJECT_COUNT_CONFIG_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSimultaneousDetectionLimitAttribute(
+    public void writeObjectCountConfigAttribute(DefaultClusterCallback callback, ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value) {
+      writeObjectCountConfigAttribute(callback, value, 0);
+    }
+
+    public void writeObjectCountConfigAttribute(DefaultClusterCallback callback, ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = value.encodeTlv();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OBJECT_COUNT_CONFIG_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeObjectCountConfigAttribute(
+        ObjectCountConfigAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_CONFIG_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OBJECT_COUNT_CONFIG_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readObjectCountAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OBJECT_COUNT_ATTRIBUTE_ID, true);
+    }
+
+    public void subscribeObjectCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_ATTRIBUTE_ID);
 
       subscribeAttribute(new ReportCallbackImpl(callback, path) {
           @Override
@@ -52212,33 +52342,42 @@ public void onSuccess(byte[] tlv) {
             Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
-        }, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
+        }, OBJECT_COUNT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readObjectCountReachedAttribute(
-        BooleanAttributeCallback callback) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_REACHED_ATTRIBUTE_ID);
+    public void readSimultaneousDetectionLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID);
 
       readAttribute(new ReportCallbackImpl(callback, path) {
           @Override
           public void onSuccess(byte[] tlv) {
-            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
-        }, OBJECT_COUNT_REACHED_ATTRIBUTE_ID, true);
+        }, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeObjectCountReachedAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OBJECT_COUNT_REACHED_ATTRIBUTE_ID);
+    public void writeSimultaneousDetectionLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSimultaneousDetectionLimitAttribute(callback, value, 0);
+    }
+
+    public void writeSimultaneousDetectionLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeSimultaneousDetectionLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID);
 
       subscribeAttribute(new ReportCallbackImpl(callback, path) {
           @Override
           public void onSuccess(byte[] tlv) {
-            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
-        }, OBJECT_COUNT_REACHED_ATTRIBUTE_ID, minInterval, maxInterval);
+        }, SIMULTANEOUS_DETECTION_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHoldTimeAttribute(
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
index 85d33a24d46..1648e44eb7b 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
@@ -6678,48 +6678,109 @@ public String toString() {
     return output.toString();
   }
 }
-public static class AmbientContextSensingClusterAmbientContextDetectedEvent {
-  public ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct> ambientContextType;
+public static class AmbientContextSensingClusterAmbientContextDetectStartedEvent {
+  public Optional<ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct>> ambientContextType;
+  public Optional<Integer> objectCount;
   private static final long AMBIENT_CONTEXT_TYPE_ID = 0L;
+  private static final long OBJECT_COUNT_ID = 1L;
 
-  public AmbientContextSensingClusterAmbientContextDetectedEvent(
-    ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct> ambientContextType
+  public AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+    Optional<ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct>> ambientContextType,
+    Optional<Integer> objectCount
   ) {
     this.ambientContextType = ambientContextType;
+    this.objectCount = objectCount;
   }
 
   public StructType encodeTlv() {
     ArrayList<StructElement> values = new ArrayList<>();
-    values.add(new StructElement(AMBIENT_CONTEXT_TYPE_ID, ArrayType.generateArrayType(ambientContextType, (elementambientContextType) -> elementambientContextType.encodeTlv())));
+    values.add(new StructElement(AMBIENT_CONTEXT_TYPE_ID, ambientContextType.<BaseTLVType>map((nonOptionalambientContextType) -> ArrayType.generateArrayType(nonOptionalambientContextType, (elementnonOptionalambientContextType) -> elementnonOptionalambientContextType.encodeTlv())).orElse(new EmptyType())));
+    values.add(new StructElement(OBJECT_COUNT_ID, objectCount.<BaseTLVType>map((nonOptionalobjectCount) -> new UIntType(nonOptionalobjectCount)).orElse(new EmptyType())));
 
     return new StructType(values);
   }
 
-  public static AmbientContextSensingClusterAmbientContextDetectedEvent decodeTlv(BaseTLVType tlvValue) {
+  public static AmbientContextSensingClusterAmbientContextDetectStartedEvent decodeTlv(BaseTLVType tlvValue) {
     if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
       return null;
     }
-    ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct> ambientContextType = null;
+    Optional<ArrayList<ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct>> ambientContextType = Optional.empty();
+    Optional<Integer> objectCount = Optional.empty();
     for (StructElement element: ((StructType)tlvValue).value()) {
       if (element.contextTagNum() == AMBIENT_CONTEXT_TYPE_ID) {
         if (element.value(BaseTLVType.class).type() == TLVType.Array) {
           ArrayType castingValue = element.value(ArrayType.class);
-          ambientContextType = castingValue.map((elementcastingValue) -> ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct.decodeTlv(elementcastingValue));
+          ambientContextType = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.AmbientContextSensingClusterAmbientContextTypeStruct.decodeTlv(elementcastingValue)));
+        }
+      } else if (element.contextTagNum() == OBJECT_COUNT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          objectCount = Optional.of(castingValue.value(Integer.class));
         }
       }
     }
-    return new AmbientContextSensingClusterAmbientContextDetectedEvent(
-      ambientContextType
+    return new AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+      ambientContextType,
+      objectCount
     );
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("AmbientContextSensingClusterAmbientContextDetectedEvent {\n");
+    output.append("AmbientContextSensingClusterAmbientContextDetectStartedEvent {\n");
     output.append("\tambientContextType: ");
     output.append(ambientContextType);
     output.append("\n");
+    output.append("\tobjectCount: ");
+    output.append(objectCount);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class AmbientContextSensingClusterAmbientContextDetectEndedEvent {
+  public Long startEventNumber;
+  private static final long START_EVENT_NUMBER_ID = 0L;
+
+  public AmbientContextSensingClusterAmbientContextDetectEndedEvent(
+    Long startEventNumber
+  ) {
+    this.startEventNumber = startEventNumber;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(START_EVENT_NUMBER_ID, new UIntType(startEventNumber)));
+
+    return new StructType(values);
+  }
+
+  public static AmbientContextSensingClusterAmbientContextDetectEndedEvent decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Long startEventNumber = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == START_EVENT_NUMBER_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          startEventNumber = castingValue.value(Long.class);
+        }
+      }
+    }
+    return new AmbientContextSensingClusterAmbientContextDetectEndedEvent(
+      startEventNumber
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("AmbientContextSensingClusterAmbientContextDetectEndedEvent {\n");
+    output.append("\tstartEventNumber: ");
+    output.append(startEventNumber);
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
index d881a60357a..b1e937163d7 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
@@ -3655,6 +3655,7 @@ public static class GroupKeyManagementClusterGroupKeySetStruct {
   public @Nullable Long epochStartTime1;
   public @Nullable byte[] epochKey2;
   public @Nullable Long epochStartTime2;
+  public Integer groupKeyMulticastPolicy;
   private static final long GROUP_KEY_SET_ID_ID = 0L;
   private static final long GROUP_KEY_SECURITY_POLICY_ID = 1L;
   private static final long EPOCH_KEY0_ID = 2L;
@@ -3663,6 +3664,7 @@ public static class GroupKeyManagementClusterGroupKeySetStruct {
   private static final long EPOCH_START_TIME1_ID = 5L;
   private static final long EPOCH_KEY2_ID = 6L;
   private static final long EPOCH_START_TIME2_ID = 7L;
+  private static final long GROUP_KEY_MULTICAST_POLICY_ID = 8L;
 
   public GroupKeyManagementClusterGroupKeySetStruct(
     Integer groupKeySetID,
@@ -3672,7 +3674,8 @@ public GroupKeyManagementClusterGroupKeySetStruct(
     @Nullable byte[] epochKey1,
     @Nullable Long epochStartTime1,
     @Nullable byte[] epochKey2,
-    @Nullable Long epochStartTime2
+    @Nullable Long epochStartTime2,
+    Integer groupKeyMulticastPolicy
   ) {
     this.groupKeySetID = groupKeySetID;
     this.groupKeySecurityPolicy = groupKeySecurityPolicy;
@@ -3682,6 +3685,7 @@ public GroupKeyManagementClusterGroupKeySetStruct(
     this.epochStartTime1 = epochStartTime1;
     this.epochKey2 = epochKey2;
     this.epochStartTime2 = epochStartTime2;
+    this.groupKeyMulticastPolicy = groupKeyMulticastPolicy;
   }
 
   public StructType encodeTlv() {
@@ -3694,6 +3698,7 @@ public StructType encodeTlv() {
     values.add(new StructElement(EPOCH_START_TIME1_ID, epochStartTime1 != null ? new UIntType(epochStartTime1) : new NullType()));
     values.add(new StructElement(EPOCH_KEY2_ID, epochKey2 != null ? new ByteArrayType(epochKey2) : new NullType()));
     values.add(new StructElement(EPOCH_START_TIME2_ID, epochStartTime2 != null ? new UIntType(epochStartTime2) : new NullType()));
+    values.add(new StructElement(GROUP_KEY_MULTICAST_POLICY_ID, new UIntType(groupKeyMulticastPolicy)));
 
     return new StructType(values);
   }
@@ -3710,6 +3715,7 @@ public static GroupKeyManagementClusterGroupKeySetStruct decodeTlv(BaseTLVType t
     @Nullable Long epochStartTime1 = null;
     @Nullable byte[] epochKey2 = null;
     @Nullable Long epochStartTime2 = null;
+    Integer groupKeyMulticastPolicy = null;
     for (StructElement element: ((StructType)tlvValue).value()) {
       if (element.contextTagNum() == GROUP_KEY_SET_ID_ID) {
         if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -3751,6 +3757,11 @@ public static GroupKeyManagementClusterGroupKeySetStruct decodeTlv(BaseTLVType t
           UIntType castingValue = element.value(UIntType.class);
           epochStartTime2 = castingValue.value(Long.class);
         }
+      } else if (element.contextTagNum() == GROUP_KEY_MULTICAST_POLICY_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          groupKeyMulticastPolicy = castingValue.value(Integer.class);
+        }
       }
     }
     return new GroupKeyManagementClusterGroupKeySetStruct(
@@ -3761,7 +3772,8 @@ public static GroupKeyManagementClusterGroupKeySetStruct decodeTlv(BaseTLVType t
       epochKey1,
       epochStartTime1,
       epochKey2,
-      epochStartTime2
+      epochStartTime2,
+      groupKeyMulticastPolicy
     );
   }
 
@@ -3793,6 +3805,70 @@ public String toString() {
     output.append("\tepochStartTime2: ");
     output.append(epochStartTime2);
     output.append("\n");
+    output.append("\tgroupKeyMulticastPolicy: ");
+    output.append(groupKeyMulticastPolicy);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+public static class GroupKeyManagementClusterGroupcastAdoptionStruct {
+  public Boolean groupcastAdopted;
+  public Integer fabricIndex;
+  private static final long GROUPCAST_ADOPTED_ID = 0L;
+  private static final long FABRIC_INDEX_ID = 254L;
+
+  public GroupKeyManagementClusterGroupcastAdoptionStruct(
+    Boolean groupcastAdopted,
+    Integer fabricIndex
+  ) {
+    this.groupcastAdopted = groupcastAdopted;
+    this.fabricIndex = fabricIndex;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(GROUPCAST_ADOPTED_ID, new BooleanType(groupcastAdopted)));
+    values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
+
+    return new StructType(values);
+  }
+
+  public static GroupKeyManagementClusterGroupcastAdoptionStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    Boolean groupcastAdopted = null;
+    Integer fabricIndex = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == GROUPCAST_ADOPTED_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
+          BooleanType castingValue = element.value(BooleanType.class);
+          groupcastAdopted = castingValue.value(Boolean.class);
+        }
+      } else if (element.contextTagNum() == FABRIC_INDEX_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          fabricIndex = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new GroupKeyManagementClusterGroupcastAdoptionStruct(
+      groupcastAdopted,
+      fabricIndex
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("GroupKeyManagementClusterGroupcastAdoptionStruct {\n");
+    output.append("\tgroupcastAdopted: ");
+    output.append(groupcastAdopted);
+    output.append("\n");
+    output.append("\tfabricIndex: ");
+    output.append(fabricIndex);
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
@@ -11584,31 +11660,21 @@ public String toString() {
 public static class AmbientContextSensingClusterAmbientContextTypeStruct {
   public ArrayList<ChipStructs.AmbientContextSensingClusterSemanticTagStruct> ambientContextSensed;
   public Optional<Long> detectionStartTime;
-  public Optional<Integer> objectCountThreshold;
-  public Optional<Integer> objectCount;
   private static final long AMBIENT_CONTEXT_SENSED_ID = 0L;
   private static final long DETECTION_START_TIME_ID = 1L;
-  private static final long OBJECT_COUNT_THRESHOLD_ID = 2L;
-  private static final long OBJECT_COUNT_ID = 3L;
 
   public AmbientContextSensingClusterAmbientContextTypeStruct(
     ArrayList<ChipStructs.AmbientContextSensingClusterSemanticTagStruct> ambientContextSensed,
-    Optional<Long> detectionStartTime,
-    Optional<Integer> objectCountThreshold,
-    Optional<Integer> objectCount
+    Optional<Long> detectionStartTime
   ) {
     this.ambientContextSensed = ambientContextSensed;
     this.detectionStartTime = detectionStartTime;
-    this.objectCountThreshold = objectCountThreshold;
-    this.objectCount = objectCount;
   }
 
   public StructType encodeTlv() {
     ArrayList<StructElement> values = new ArrayList<>();
     values.add(new StructElement(AMBIENT_CONTEXT_SENSED_ID, ArrayType.generateArrayType(ambientContextSensed, (elementambientContextSensed) -> elementambientContextSensed.encodeTlv())));
     values.add(new StructElement(DETECTION_START_TIME_ID, detectionStartTime.<BaseTLVType>map((nonOptionaldetectionStartTime) -> new UIntType(nonOptionaldetectionStartTime)).orElse(new EmptyType())));
-    values.add(new StructElement(OBJECT_COUNT_THRESHOLD_ID, objectCountThreshold.<BaseTLVType>map((nonOptionalobjectCountThreshold) -> new UIntType(nonOptionalobjectCountThreshold)).orElse(new EmptyType())));
-    values.add(new StructElement(OBJECT_COUNT_ID, objectCount.<BaseTLVType>map((nonOptionalobjectCount) -> new UIntType(nonOptionalobjectCount)).orElse(new EmptyType())));
 
     return new StructType(values);
   }
@@ -11619,8 +11685,6 @@ public static AmbientContextSensingClusterAmbientContextTypeStruct decodeTlv(Bas
     }
     ArrayList<ChipStructs.AmbientContextSensingClusterSemanticTagStruct> ambientContextSensed = null;
     Optional<Long> detectionStartTime = Optional.empty();
-    Optional<Integer> objectCountThreshold = Optional.empty();
-    Optional<Integer> objectCount = Optional.empty();
     for (StructElement element: ((StructType)tlvValue).value()) {
       if (element.contextTagNum() == AMBIENT_CONTEXT_SENSED_ID) {
         if (element.value(BaseTLVType.class).type() == TLVType.Array) {
@@ -11632,23 +11696,11 @@ public static AmbientContextSensingClusterAmbientContextTypeStruct decodeTlv(Bas
           UIntType castingValue = element.value(UIntType.class);
           detectionStartTime = Optional.of(castingValue.value(Long.class));
         }
-      } else if (element.contextTagNum() == OBJECT_COUNT_THRESHOLD_ID) {
-        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
-          UIntType castingValue = element.value(UIntType.class);
-          objectCountThreshold = Optional.of(castingValue.value(Integer.class));
-        }
-      } else if (element.contextTagNum() == OBJECT_COUNT_ID) {
-        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
-          UIntType castingValue = element.value(UIntType.class);
-          objectCount = Optional.of(castingValue.value(Integer.class));
-        }
       }
     }
     return new AmbientContextSensingClusterAmbientContextTypeStruct(
       ambientContextSensed,
-      detectionStartTime,
-      objectCountThreshold,
-      objectCount
+      detectionStartTime
     );
   }
 
@@ -11662,12 +11714,6 @@ public String toString() {
     output.append("\tdetectionStartTime: ");
     output.append(detectionStartTime);
     output.append("\n");
-    output.append("\tobjectCountThreshold: ");
-    output.append(objectCountThreshold);
-    output.append("\n");
-    output.append("\tobjectCount: ");
-    output.append(objectCount);
-    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
@@ -11748,6 +11794,67 @@ public String toString() {
     return output.toString();
   }
 }
+public static class AmbientContextSensingClusterObjectCountConfigStruct {
+  public ChipStructs.AmbientContextSensingClusterSemanticTagStruct countingObject;
+  public Integer objectCountThreshold;
+  private static final long COUNTING_OBJECT_ID = 0L;
+  private static final long OBJECT_COUNT_THRESHOLD_ID = 1L;
+
+  public AmbientContextSensingClusterObjectCountConfigStruct(
+    ChipStructs.AmbientContextSensingClusterSemanticTagStruct countingObject,
+    Integer objectCountThreshold
+  ) {
+    this.countingObject = countingObject;
+    this.objectCountThreshold = objectCountThreshold;
+  }
+
+  public StructType encodeTlv() {
+    ArrayList<StructElement> values = new ArrayList<>();
+    values.add(new StructElement(COUNTING_OBJECT_ID, countingObject.encodeTlv()));
+    values.add(new StructElement(OBJECT_COUNT_THRESHOLD_ID, new UIntType(objectCountThreshold)));
+
+    return new StructType(values);
+  }
+
+  public static AmbientContextSensingClusterObjectCountConfigStruct decodeTlv(BaseTLVType tlvValue) {
+    if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
+      return null;
+    }
+    ChipStructs.AmbientContextSensingClusterSemanticTagStruct countingObject = null;
+    Integer objectCountThreshold = null;
+    for (StructElement element: ((StructType)tlvValue).value()) {
+      if (element.contextTagNum() == COUNTING_OBJECT_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.Struct) {
+          StructType castingValue = element.value(StructType.class);
+          countingObject = ChipStructs.AmbientContextSensingClusterSemanticTagStruct.decodeTlv(castingValue);
+        }
+      } else if (element.contextTagNum() == OBJECT_COUNT_THRESHOLD_ID) {
+        if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+          UIntType castingValue = element.value(UIntType.class);
+          objectCountThreshold = castingValue.value(Integer.class);
+        }
+      }
+    }
+    return new AmbientContextSensingClusterObjectCountConfigStruct(
+      countingObject,
+      objectCountThreshold
+    );
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("AmbientContextSensingClusterObjectCountConfigStruct {\n");
+    output.append("\tcountingObject: ");
+    output.append(countingObject);
+    output.append("\n");
+    output.append("\tobjectCountThreshold: ");
+    output.append(objectCountThreshold);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
 public static class AmbientContextSensingClusterPredictedActivityStruct {
   public Long startTimestamp;
   public Long endTimestamp;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index c76369de2d3..8bbbdc89f75 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -4959,6 +4959,7 @@ public enum Attribute {
             GroupTable(1L),
             MaxGroupsPerFabric(2L),
             MaxGroupKeysPerFabric(3L),
+            GroupcastAdoption(4L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             AttributeList(65531L),
@@ -7520,6 +7521,7 @@ public enum Attribute {
             ContaminationState(10L),
             SmokeSensitivityLevel(11L),
             ExpiryDate(12L),
+            Unmounted(13L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             AttributeList(65531L),
@@ -15216,11 +15218,13 @@ public enum Attribute {
             AudioContextDetected(2L),
             AmbientContextType(3L),
             AmbientContextTypeSupported(4L),
-            SimultaneousDetectionLimit(5L),
-            ObjectCountReached(6L),
-            HoldTime(7L),
-            HoldTimeLimits(8L),
-            PredictedActivity(9L),
+            ObjectCountReached(5L),
+            ObjectCountConfig(6L),
+            ObjectCount(7L),
+            SimultaneousDetectionLimit(8L),
+            HoldTime(9L),
+            HoldTimeLimits(10L),
+            PredictedActivity(11L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             AttributeList(65531L),
@@ -15246,7 +15250,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
         }
 
         public enum Event {
-            AmbientContextDetected(0L),;
+            AmbientContextDetectStarted(0L),
+            AmbientContextDetectEnded(1L),;
             private final long id;
             Event(long id) {
                 this.id = id;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
index c554acc4f23..340b851626e 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -4977,6 +4977,27 @@ public void onError(Exception ex) {
     }
   }
 
+  public static class DelegatedGroupKeyManagementClusterGroupcastAdoptionAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GroupcastAdoptionAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GroupKeyManagementClusterGroupcastAdoptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
   public static class DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
@@ -16386,6 +16407,27 @@ public void onError(Exception ex) {
     }
   }
 
+  public static class DelegatedAmbientContextSensingClusterObjectCountConfigAttributeCallback implements ChipClusters.AmbientContextSensingCluster.ObjectCountConfigAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.AmbientContextSensingClusterObjectCountConfigStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
   public static class DelegatedAmbientContextSensingClusterHoldTimeLimitsAttributeCallback implements ChipClusters.AmbientContextSensingCluster.HoldTimeLimitsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
index e6891f177bf..79c015fde83 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
@@ -4788,6 +4788,17 @@ private static Map<String, InteractionInfo> readGroupKeyManagementInteractionInf
           readGroupKeyManagementMaxGroupKeysPerFabricCommandParams
         );
         result.put("readMaxGroupKeysPerFabricAttribute", readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readGroupKeyManagementGroupcastAdoptionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readGroupKeyManagementGroupcastAdoptionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.GroupKeyManagementCluster) cluster).readGroupcastAdoptionAttribute(
+              (ChipClusters.GroupKeyManagementCluster.GroupcastAdoptionAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedGroupKeyManagementClusterGroupcastAdoptionAttributeCallback(),
+          readGroupKeyManagementGroupcastAdoptionCommandParams
+        );
+        result.put("readGroupcastAdoptionAttribute", readGroupKeyManagementGroupcastAdoptionAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readGroupKeyManagementGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -6834,6 +6845,17 @@ private static Map<String, InteractionInfo> readSmokeCoAlarmInteractionInfo() {
           readSmokeCoAlarmExpiryDateCommandParams
         );
         result.put("readExpiryDateAttribute", readSmokeCoAlarmExpiryDateAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readSmokeCoAlarmUnmountedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readSmokeCoAlarmUnmountedAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.SmokeCoAlarmCluster) cluster).readUnmountedAttribute(
+              (ChipClusters.BooleanAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+          readSmokeCoAlarmUnmountedCommandParams
+        );
+        result.put("readUnmountedAttribute", readSmokeCoAlarmUnmountedAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readSmokeCoAlarmGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readSmokeCoAlarmGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -16081,17 +16103,6 @@ private static Map<String, InteractionInfo> readAmbientContextSensingInteraction
           readAmbientContextSensingAmbientContextTypeSupportedCommandParams
         );
         result.put("readAmbientContextTypeSupportedAttribute", readAmbientContextSensingAmbientContextTypeSupportedAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readAmbientContextSensingSimultaneousDetectionLimitCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readAmbientContextSensingSimultaneousDetectionLimitAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.AmbientContextSensingCluster) cluster).readSimultaneousDetectionLimitAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-          readAmbientContextSensingSimultaneousDetectionLimitCommandParams
-        );
-        result.put("readSimultaneousDetectionLimitAttribute", readAmbientContextSensingSimultaneousDetectionLimitAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readAmbientContextSensingObjectCountReachedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readAmbientContextSensingObjectCountReachedAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -16103,6 +16114,28 @@ private static Map<String, InteractionInfo> readAmbientContextSensingInteraction
           readAmbientContextSensingObjectCountReachedCommandParams
         );
         result.put("readObjectCountReachedAttribute", readAmbientContextSensingObjectCountReachedAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readAmbientContextSensingObjectCountCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readAmbientContextSensingObjectCountAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.AmbientContextSensingCluster) cluster).readObjectCountAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readAmbientContextSensingObjectCountCommandParams
+        );
+        result.put("readObjectCountAttribute", readAmbientContextSensingObjectCountAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readAmbientContextSensingSimultaneousDetectionLimitCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readAmbientContextSensingSimultaneousDetectionLimitAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.AmbientContextSensingCluster) cluster).readSimultaneousDetectionLimitAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readAmbientContextSensingSimultaneousDetectionLimitCommandParams
+        );
+        result.put("readSimultaneousDetectionLimitAttribute", readAmbientContextSensingSimultaneousDetectionLimitAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readAmbientContextSensingHoldTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readAmbientContextSensingHoldTimeAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt
new file mode 100644
index 00000000000..f31ac3b3bfd
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    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.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterAmbientContextDetectEndedEvent(val startEventNumber: ULong) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterAmbientContextDetectEndedEvent {\n")
+    append("\tstartEventNumber : $startEventNumber\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_START_EVENT_NUMBER), startEventNumber)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_START_EVENT_NUMBER = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterAmbientContextDetectEndedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val startEventNumber = tlvReader.getULong(ContextSpecificTag(TAG_START_EVENT_NUMBER))
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterAmbientContextDetectEndedEvent(startEventNumber)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt
new file mode 100644
index 00000000000..e309bd0b109
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt
@@ -0,0 +1,106 @@
+/*
+ *
+ *    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.
+ */
+package chip.devicecontroller.cluster.eventstructs
+
+import chip.devicecontroller.cluster.*
+import java.util.Optional
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+  val ambientContextType:
+    Optional<
+      List<
+        chip.devicecontroller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
+      >
+    >,
+  val objectCount: Optional<UInt>,
+) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterAmbientContextDetectStartedEvent {\n")
+    append("\tambientContextType : $ambientContextType\n")
+    append("\tobjectCount : $objectCount\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (ambientContextType.isPresent) {
+        val optambientContextType = ambientContextType.get()
+        startArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
+        for (item in optambientContextType.iterator()) {
+          item.toTlv(AnonymousTag, this)
+        }
+        endArray()
+      }
+      if (objectCount.isPresent) {
+        val optobjectCount = objectCount.get()
+        put(ContextSpecificTag(TAG_OBJECT_COUNT), optobjectCount)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_AMBIENT_CONTEXT_TYPE = 0
+    private const val TAG_OBJECT_COUNT = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterAmbientContextDetectStartedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val ambientContextType =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))) {
+          Optional.of(
+            buildList<
+              chip.devicecontroller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
+            > {
+              tlvReader.enterArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
+              while (!tlvReader.isEndOfContainer()) {
+                this.add(
+                  chip.devicecontroller.cluster.structs
+                    .AmbientContextSensingClusterAmbientContextTypeStruct
+                    .fromTlv(AnonymousTag, tlvReader)
+                )
+              }
+              tlvReader.exitContainer()
+            }
+          )
+        } else {
+          Optional.empty()
+        }
+      val objectCount =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT))) {
+          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_OBJECT_COUNT)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+        ambientContextType,
+        objectCount,
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt
deleted file mode 100644
index 553f1e3c41e..00000000000
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt
+++ /dev/null
@@ -1,76 +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.
- */
-package chip.devicecontroller.cluster.eventstructs
-
-import chip.devicecontroller.cluster.*
-import matter.tlv.AnonymousTag
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class AmbientContextSensingClusterAmbientContextDetectedEvent(
-  val ambientContextType:
-    List<chip.devicecontroller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct>
-) {
-  override fun toString(): String = buildString {
-    append("AmbientContextSensingClusterAmbientContextDetectedEvent {\n")
-    append("\tambientContextType : $ambientContextType\n")
-    append("}\n")
-  }
-
-  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
-    tlvWriter.apply {
-      startStructure(tlvTag)
-      startArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
-      for (item in ambientContextType.iterator()) {
-        item.toTlv(AnonymousTag, this)
-      }
-      endArray()
-      endStructure()
-    }
-  }
-
-  companion object {
-    private const val TAG_AMBIENT_CONTEXT_TYPE = 0
-
-    fun fromTlv(
-      tlvTag: Tag,
-      tlvReader: TlvReader,
-    ): AmbientContextSensingClusterAmbientContextDetectedEvent {
-      tlvReader.enterStructure(tlvTag)
-      val ambientContextType =
-        buildList<
-          chip.devicecontroller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
-        > {
-          tlvReader.enterArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
-          while (!tlvReader.isEndOfContainer()) {
-            this.add(
-              chip.devicecontroller.cluster.structs
-                .AmbientContextSensingClusterAmbientContextTypeStruct
-                .fromTlv(AnonymousTag, tlvReader)
-            )
-          }
-          tlvReader.exitContainer()
-        }
-
-      tlvReader.exitContainer()
-
-      return AmbientContextSensingClusterAmbientContextDetectedEvent(ambientContextType)
-    }
-  }
-}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
index 371b59512e9..fe3fe273c9a 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
@@ -13,6 +13,7 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterHoldTimeLimitsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterPredictedActivityStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterSemanticTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt",
@@ -117,6 +118,7 @@ structs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GeneralDiagnosticsClusterDeviceLoadStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupcastClusterMembershipStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt",
@@ -251,7 +253,8 @@ eventstructs_sources = [
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
index 8a7727b434d..dbec45b20e9 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
@@ -27,15 +27,11 @@ import matter.tlv.TlvWriter
 class AmbientContextSensingClusterAmbientContextTypeStruct(
   val ambientContextSensed: List<AmbientContextSensingClusterSemanticTagStruct>,
   val detectionStartTime: Optional<ULong>,
-  val objectCountThreshold: Optional<UInt>,
-  val objectCount: Optional<UInt>,
 ) {
   override fun toString(): String = buildString {
     append("AmbientContextSensingClusterAmbientContextTypeStruct {\n")
     append("\tambientContextSensed : $ambientContextSensed\n")
     append("\tdetectionStartTime : $detectionStartTime\n")
-    append("\tobjectCountThreshold : $objectCountThreshold\n")
-    append("\tobjectCount : $objectCount\n")
     append("}\n")
   }
 
@@ -51,14 +47,6 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
         val optdetectionStartTime = detectionStartTime.get()
         put(ContextSpecificTag(TAG_DETECTION_START_TIME), optdetectionStartTime)
       }
-      if (objectCountThreshold.isPresent) {
-        val optobjectCountThreshold = objectCountThreshold.get()
-        put(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD), optobjectCountThreshold)
-      }
-      if (objectCount.isPresent) {
-        val optobjectCount = objectCount.get()
-        put(ContextSpecificTag(TAG_OBJECT_COUNT), optobjectCount)
-      }
       endStructure()
     }
   }
@@ -66,8 +54,6 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
   companion object {
     private const val TAG_AMBIENT_CONTEXT_SENSED = 0
     private const val TAG_DETECTION_START_TIME = 1
-    private const val TAG_OBJECT_COUNT_THRESHOLD = 2
-    private const val TAG_OBJECT_COUNT = 3
 
     fun fromTlv(
       tlvTag: Tag,
@@ -88,26 +74,12 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
         } else {
           Optional.empty()
         }
-      val objectCountThreshold =
-        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD))) {
-          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD)))
-        } else {
-          Optional.empty()
-        }
-      val objectCount =
-        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT))) {
-          Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_OBJECT_COUNT)))
-        } else {
-          Optional.empty()
-        }
 
       tlvReader.exitContainer()
 
       return AmbientContextSensingClusterAmbientContextTypeStruct(
         ambientContextSensed,
         detectionStartTime,
-        objectCountThreshold,
-        objectCount,
       )
     }
   }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt
new file mode 100644
index 00000000000..4f2ac4f979d
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    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.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterObjectCountConfigStruct(
+  val countingObject: AmbientContextSensingClusterSemanticTagStruct,
+  val objectCountThreshold: UInt,
+) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterObjectCountConfigStruct {\n")
+    append("\tcountingObject : $countingObject\n")
+    append("\tobjectCountThreshold : $objectCountThreshold\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      countingObject.toTlv(ContextSpecificTag(TAG_COUNTING_OBJECT), this)
+      put(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD), objectCountThreshold)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COUNTING_OBJECT = 0
+    private const val TAG_OBJECT_COUNT_THRESHOLD = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterObjectCountConfigStruct {
+      tlvReader.enterStructure(tlvTag)
+      val countingObject =
+        AmbientContextSensingClusterSemanticTagStruct.fromTlv(
+          ContextSpecificTag(TAG_COUNTING_OBJECT),
+          tlvReader,
+        )
+      val objectCountThreshold = tlvReader.getUInt(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD))
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterObjectCountConfigStruct(
+        countingObject,
+        objectCountThreshold,
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
index 5dd1291b0d1..f3dc165b3d5 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
@@ -31,6 +31,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
   val epochStartTime1: ULong?,
   val epochKey2: ByteArray?,
   val epochStartTime2: ULong?,
+  val groupKeyMulticastPolicy: UInt,
 ) {
   override fun toString(): String = buildString {
     append("GroupKeyManagementClusterGroupKeySetStruct {\n")
@@ -42,6 +43,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
     append("\tepochStartTime1 : $epochStartTime1\n")
     append("\tepochKey2 : $epochKey2\n")
     append("\tepochStartTime2 : $epochStartTime2\n")
+    append("\tgroupKeyMulticastPolicy : $groupKeyMulticastPolicy\n")
     append("}\n")
   }
 
@@ -80,6 +82,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
       } else {
         putNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
       }
+      put(ContextSpecificTag(TAG_GROUP_KEY_MULTICAST_POLICY), groupKeyMulticastPolicy)
       endStructure()
     }
   }
@@ -93,6 +96,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
     private const val TAG_EPOCH_START_TIME1 = 5
     private const val TAG_EPOCH_KEY2 = 6
     private const val TAG_EPOCH_START_TIME2 = 7
+    private const val TAG_GROUP_KEY_MULTICAST_POLICY = 8
 
     fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeySetStruct {
       tlvReader.enterStructure(tlvTag)
@@ -141,6 +145,8 @@ class GroupKeyManagementClusterGroupKeySetStruct(
           tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
           null
         }
+      val groupKeyMulticastPolicy =
+        tlvReader.getUInt(ContextSpecificTag(TAG_GROUP_KEY_MULTICAST_POLICY))
 
       tlvReader.exitContainer()
 
@@ -153,6 +159,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
         epochStartTime1,
         epochKey2,
         epochStartTime2,
+        groupKeyMulticastPolicy,
       )
     }
   }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt
new file mode 100644
index 00000000000..c8ecadf4033
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt
@@ -0,0 +1,62 @@
+/*
+ *
+ *    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.
+ */
+package chip.devicecontroller.cluster.structs
+
+import chip.devicecontroller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GroupKeyManagementClusterGroupcastAdoptionStruct(
+  val groupcastAdopted: Boolean,
+  val fabricIndex: UInt,
+) {
+  override fun toString(): String = buildString {
+    append("GroupKeyManagementClusterGroupcastAdoptionStruct {\n")
+    append("\tgroupcastAdopted : $groupcastAdopted\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_GROUPCAST_ADOPTED), groupcastAdopted)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_GROUPCAST_ADOPTED = 0
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): GroupKeyManagementClusterGroupcastAdoptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val groupcastAdopted = tlvReader.getBoolean(ContextSpecificTag(TAG_GROUPCAST_ADOPTED))
+      val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return GroupKeyManagementClusterGroupcastAdoptionStruct(groupcastAdopted, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/AmbientContextSensingCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AmbientContextSensingCluster.kt
index 15b3f5baf47..e71c7c308a8 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/AmbientContextSensingCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AmbientContextSensingCluster.kt
@@ -71,6 +71,17 @@ class AmbientContextSensingCluster(
     object SubscriptionEstablished : AmbientContextTypeSupportedAttributeSubscriptionState()
   }
 
+  class ObjectCountConfigAttribute(val value: AmbientContextSensingClusterObjectCountConfigStruct?)
+
+  sealed class ObjectCountConfigAttributeSubscriptionState {
+    data class Success(val value: AmbientContextSensingClusterObjectCountConfigStruct?) :
+      ObjectCountConfigAttributeSubscriptionState()
+
+    data class Error(val exception: Exception) : ObjectCountConfigAttributeSubscriptionState()
+
+    object SubscriptionEstablished : ObjectCountConfigAttributeSubscriptionState()
+  }
+
   class HoldTimeLimitsAttribute(val value: AmbientContextSensingClusterHoldTimeLimitsStruct)
 
   sealed class HoldTimeLimitsAttributeSubscriptionState {
@@ -625,7 +636,7 @@ class AmbientContextSensingCluster(
     }
   }
 
-  suspend fun readSimultaneousDetectionLimitAttribute(): UByte {
+  suspend fun readObjectCountReachedAttribute(): Boolean? {
     val ATTRIBUTE_ID: UInt = 5u
 
     val attributePath =
@@ -647,23 +658,121 @@ class AmbientContextSensingCluster(
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Simultaneousdetectionlimit attribute not found in response" }
+    requireNotNull(attributeData) { "Objectcountreached attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
+    val decodedValue: Boolean? =
+      if (tlvReader.isNextTag(AnonymousTag)) {
+        tlvReader.getBoolean(AnonymousTag)
+      } else {
+        null
+      }
 
     return decodedValue
   }
 
-  suspend fun writeSimultaneousDetectionLimitAttribute(
-    value: UByte,
+  suspend fun subscribeObjectCountReachedAttribute(
+    minInterval: Int,
+    maxInterval: Int,
+  ): Flow<BooleanSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 5u
+    val attributePaths =
+      listOf(
+        AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+      )
+
+    val subscribeRequest: SubscribeRequest =
+      SubscribeRequest(
+        eventPaths = emptyList(),
+        attributePaths = attributePaths,
+        minInterval = Duration.ofSeconds(minInterval.toLong()),
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
+      )
+
+    return controller.subscribe(subscribeRequest).transform { subscriptionState ->
+      when (subscriptionState) {
+        is SubscriptionState.SubscriptionErrorNotification -> {
+          emit(
+            BooleanSubscriptionState.Error(
+              Exception(
+                "Subscription terminated with error code: ${subscriptionState.terminationCause}"
+              )
+            )
+          )
+        }
+        is SubscriptionState.NodeStateUpdate -> {
+          val attributeData =
+            subscriptionState.updateState.successes
+              .filterIsInstance<ReadData.Attribute>()
+              .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
+
+          requireNotNull(attributeData) {
+            "Objectcountreached attribute not found in Node State update"
+          }
+
+          // Decode the TLV data into the appropriate type
+          val tlvReader = TlvReader(attributeData.data)
+          val decodedValue: Boolean? =
+            if (tlvReader.isNextTag(AnonymousTag)) {
+              tlvReader.getBoolean(AnonymousTag)
+            } else {
+              null
+            }
+
+          decodedValue?.let { emit(BooleanSubscriptionState.Success(it)) }
+        }
+        SubscriptionState.SubscriptionEstablished -> {
+          emit(BooleanSubscriptionState.SubscriptionEstablished)
+        }
+      }
+    }
+  }
+
+  suspend fun readObjectCountConfigAttribute(): ObjectCountConfigAttribute {
+    val ATTRIBUTE_ID: UInt = 6u
+
+    val attributePath =
+      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+
+    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
+
+    val response = controller.read(readRequest)
+
+    if (response.successes.isEmpty()) {
+      logger.log(Level.WARNING, "Read command failed")
+      throw IllegalStateException("Read command failed with failures: ${response.failures}")
+    }
+
+    logger.log(Level.FINE, "Read command succeeded")
+
+    val attributeData =
+      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
+        it.path.attributeId == ATTRIBUTE_ID
+      }
+
+    requireNotNull(attributeData) { "Objectcountconfig attribute not found in response" }
+
+    // Decode the TLV data into the appropriate type
+    val tlvReader = TlvReader(attributeData.data)
+    val decodedValue: AmbientContextSensingClusterObjectCountConfigStruct? =
+      if (tlvReader.isNextTag(AnonymousTag)) {
+        AmbientContextSensingClusterObjectCountConfigStruct.fromTlv(AnonymousTag, tlvReader)
+      } else {
+        null
+      }
+
+    return ObjectCountConfigAttribute(decodedValue)
+  }
+
+  suspend fun writeObjectCountConfigAttribute(
+    value: AmbientContextSensingClusterObjectCountConfigStruct,
     timedWriteTimeout: Duration? = null,
   ) {
-    val ATTRIBUTE_ID: UInt = 5u
+    val ATTRIBUTE_ID: UInt = 6u
 
     val tlvWriter = TlvWriter()
-    tlvWriter.put(AnonymousTag, value)
+    value.toTlv(AnonymousTag, tlvWriter)
 
     val writeRequests: WriteRequests =
       WriteRequests(
@@ -699,11 +808,11 @@ class AmbientContextSensingCluster(
     }
   }
 
-  suspend fun subscribeSimultaneousDetectionLimitAttribute(
+  suspend fun subscribeObjectCountConfigAttribute(
     minInterval: Int,
     maxInterval: Int,
-  ): Flow<UByteSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 5u
+  ): Flow<ObjectCountConfigAttributeSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 6u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -721,7 +830,7 @@ class AmbientContextSensingCluster(
       when (subscriptionState) {
         is SubscriptionState.SubscriptionErrorNotification -> {
           emit(
-            UByteSubscriptionState.Error(
+            ObjectCountConfigAttributeSubscriptionState.Error(
               Exception(
                 "Subscription terminated with error code: ${subscriptionState.terminationCause}"
               )
@@ -735,24 +844,29 @@ class AmbientContextSensingCluster(
               .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
 
           requireNotNull(attributeData) {
-            "Simultaneousdetectionlimit attribute not found in Node State update"
+            "Objectcountconfig attribute not found in Node State update"
           }
 
           // Decode the TLV data into the appropriate type
           val tlvReader = TlvReader(attributeData.data)
-          val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
+          val decodedValue: AmbientContextSensingClusterObjectCountConfigStruct? =
+            if (tlvReader.isNextTag(AnonymousTag)) {
+              AmbientContextSensingClusterObjectCountConfigStruct.fromTlv(AnonymousTag, tlvReader)
+            } else {
+              null
+            }
 
-          emit(UByteSubscriptionState.Success(decodedValue))
+          decodedValue?.let { emit(ObjectCountConfigAttributeSubscriptionState.Success(it)) }
         }
         SubscriptionState.SubscriptionEstablished -> {
-          emit(UByteSubscriptionState.SubscriptionEstablished)
+          emit(ObjectCountConfigAttributeSubscriptionState.SubscriptionEstablished)
         }
       }
     }
   }
 
-  suspend fun readObjectCountReachedAttribute(): Boolean? {
-    val ATTRIBUTE_ID: UInt = 6u
+  suspend fun readObjectCountAttribute(): UShort? {
+    val ATTRIBUTE_ID: UInt = 7u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -773,13 +887,13 @@ class AmbientContextSensingCluster(
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Objectcountreached attribute not found in response" }
+    requireNotNull(attributeData) { "Objectcount attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Boolean? =
+    val decodedValue: UShort? =
       if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getBoolean(AnonymousTag)
+        tlvReader.getUShort(AnonymousTag)
       } else {
         null
       }
@@ -787,11 +901,11 @@ class AmbientContextSensingCluster(
     return decodedValue
   }
 
-  suspend fun subscribeObjectCountReachedAttribute(
+  suspend fun subscribeObjectCountAttribute(
     minInterval: Int,
     maxInterval: Int,
-  ): Flow<BooleanSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 6u
+  ): Flow<UShortSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 7u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -809,7 +923,7 @@ class AmbientContextSensingCluster(
       when (subscriptionState) {
         is SubscriptionState.SubscriptionErrorNotification -> {
           emit(
-            BooleanSubscriptionState.Error(
+            UShortSubscriptionState.Error(
               Exception(
                 "Subscription terminated with error code: ${subscriptionState.terminationCause}"
               )
@@ -822,30 +936,154 @@ class AmbientContextSensingCluster(
               .filterIsInstance<ReadData.Attribute>()
               .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
 
-          requireNotNull(attributeData) {
-            "Objectcountreached attribute not found in Node State update"
-          }
+          requireNotNull(attributeData) { "Objectcount attribute not found in Node State update" }
 
           // Decode the TLV data into the appropriate type
           val tlvReader = TlvReader(attributeData.data)
-          val decodedValue: Boolean? =
+          val decodedValue: UShort? =
             if (tlvReader.isNextTag(AnonymousTag)) {
-              tlvReader.getBoolean(AnonymousTag)
+              tlvReader.getUShort(AnonymousTag)
             } else {
               null
             }
 
-          decodedValue?.let { emit(BooleanSubscriptionState.Success(it)) }
+          decodedValue?.let { emit(UShortSubscriptionState.Success(it)) }
         }
         SubscriptionState.SubscriptionEstablished -> {
-          emit(BooleanSubscriptionState.SubscriptionEstablished)
+          emit(UShortSubscriptionState.SubscriptionEstablished)
+        }
+      }
+    }
+  }
+
+  suspend fun readSimultaneousDetectionLimitAttribute(): UByte {
+    val ATTRIBUTE_ID: UInt = 8u
+
+    val attributePath =
+      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+
+    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
+
+    val response = controller.read(readRequest)
+
+    if (response.successes.isEmpty()) {
+      logger.log(Level.WARNING, "Read command failed")
+      throw IllegalStateException("Read command failed with failures: ${response.failures}")
+    }
+
+    logger.log(Level.FINE, "Read command succeeded")
+
+    val attributeData =
+      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
+        it.path.attributeId == ATTRIBUTE_ID
+      }
+
+    requireNotNull(attributeData) { "Simultaneousdetectionlimit attribute not found in response" }
+
+    // Decode the TLV data into the appropriate type
+    val tlvReader = TlvReader(attributeData.data)
+    val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
+
+    return decodedValue
+  }
+
+  suspend fun writeSimultaneousDetectionLimitAttribute(
+    value: UByte,
+    timedWriteTimeout: Duration? = null,
+  ) {
+    val ATTRIBUTE_ID: UInt = 8u
+
+    val tlvWriter = TlvWriter()
+    tlvWriter.put(AnonymousTag, value)
+
+    val writeRequests: WriteRequests =
+      WriteRequests(
+        requests =
+          listOf(
+            WriteRequest(
+              attributePath =
+                AttributePath(endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID),
+              tlvPayload = tlvWriter.getEncoded(),
+            )
+          ),
+        timedRequest = timedWriteTimeout,
+      )
+
+    val response: WriteResponse = controller.write(writeRequests)
+
+    when (response) {
+      is WriteResponse.Success -> {
+        logger.log(Level.FINE, "Write command succeeded")
+      }
+      is WriteResponse.PartialWriteFailure -> {
+        val aggregatedErrorMessage =
+          response.failures.joinToString("\n") { failure ->
+            "Error at ${failure.attributePath}: ${failure.ex.message}"
+          }
+
+        response.failures.forEach { failure ->
+          logger.log(Level.WARNING, "Error at ${failure.attributePath}: ${failure.ex.message}")
+        }
+
+        throw IllegalStateException("Write command failed with errors: \n$aggregatedErrorMessage")
+      }
+    }
+  }
+
+  suspend fun subscribeSimultaneousDetectionLimitAttribute(
+    minInterval: Int,
+    maxInterval: Int,
+  ): Flow<UByteSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 8u
+    val attributePaths =
+      listOf(
+        AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+      )
+
+    val subscribeRequest: SubscribeRequest =
+      SubscribeRequest(
+        eventPaths = emptyList(),
+        attributePaths = attributePaths,
+        minInterval = Duration.ofSeconds(minInterval.toLong()),
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
+      )
+
+    return controller.subscribe(subscribeRequest).transform { subscriptionState ->
+      when (subscriptionState) {
+        is SubscriptionState.SubscriptionErrorNotification -> {
+          emit(
+            UByteSubscriptionState.Error(
+              Exception(
+                "Subscription terminated with error code: ${subscriptionState.terminationCause}"
+              )
+            )
+          )
+        }
+        is SubscriptionState.NodeStateUpdate -> {
+          val attributeData =
+            subscriptionState.updateState.successes
+              .filterIsInstance<ReadData.Attribute>()
+              .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
+
+          requireNotNull(attributeData) {
+            "Simultaneousdetectionlimit attribute not found in Node State update"
+          }
+
+          // Decode the TLV data into the appropriate type
+          val tlvReader = TlvReader(attributeData.data)
+          val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
+
+          emit(UByteSubscriptionState.Success(decodedValue))
+        }
+        SubscriptionState.SubscriptionEstablished -> {
+          emit(UByteSubscriptionState.SubscriptionEstablished)
         }
       }
     }
   }
 
   suspend fun readHoldTimeAttribute(): UShort {
-    val ATTRIBUTE_ID: UInt = 7u
+    val ATTRIBUTE_ID: UInt = 9u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -876,7 +1114,7 @@ class AmbientContextSensingCluster(
   }
 
   suspend fun writeHoldTimeAttribute(value: UShort, timedWriteTimeout: Duration? = null) {
-    val ATTRIBUTE_ID: UInt = 7u
+    val ATTRIBUTE_ID: UInt = 9u
 
     val tlvWriter = TlvWriter()
     tlvWriter.put(AnonymousTag, value)
@@ -919,7 +1157,7 @@ class AmbientContextSensingCluster(
     minInterval: Int,
     maxInterval: Int,
   ): Flow<UShortSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 7u
+    val ATTRIBUTE_ID: UInt = 9u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -966,7 +1204,7 @@ class AmbientContextSensingCluster(
   }
 
   suspend fun readHoldTimeLimitsAttribute(): HoldTimeLimitsAttribute {
-    val ATTRIBUTE_ID: UInt = 8u
+    val ATTRIBUTE_ID: UInt = 10u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -1001,7 +1239,7 @@ class AmbientContextSensingCluster(
     minInterval: Int,
     maxInterval: Int,
   ): Flow<HoldTimeLimitsAttributeSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 8u
+    val ATTRIBUTE_ID: UInt = 10u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -1051,7 +1289,7 @@ class AmbientContextSensingCluster(
   }
 
   suspend fun readPredictedActivityAttribute(): PredictedActivityAttribute {
-    val ATTRIBUTE_ID: UInt = 9u
+    val ATTRIBUTE_ID: UInt = 11u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -1098,7 +1336,7 @@ class AmbientContextSensingCluster(
     minInterval: Int,
     maxInterval: Int,
   ): Flow<PredictedActivityAttributeSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 9u
+    val ATTRIBUTE_ID: UInt = 11u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
index 6443ca8fe0a..996f4aa26fc 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
@@ -72,6 +72,19 @@ class GroupKeyManagementCluster(
     object SubscriptionEstablished : GroupTableAttributeSubscriptionState()
   }
 
+  class GroupcastAdoptionAttribute(
+    val value: List<GroupKeyManagementClusterGroupcastAdoptionStruct>?
+  )
+
+  sealed class GroupcastAdoptionAttributeSubscriptionState {
+    data class Success(val value: List<GroupKeyManagementClusterGroupcastAdoptionStruct>?) :
+      GroupcastAdoptionAttributeSubscriptionState()
+
+    data class Error(val exception: Exception) : GroupcastAdoptionAttributeSubscriptionState()
+
+    object SubscriptionEstablished : GroupcastAdoptionAttributeSubscriptionState()
+  }
+
   class GeneratedCommandListAttribute(val value: List<UInt>)
 
   sealed class GeneratedCommandListAttributeSubscriptionState {
@@ -647,6 +660,163 @@ class GroupKeyManagementCluster(
     }
   }
 
+  suspend fun readGroupcastAdoptionAttribute(): GroupcastAdoptionAttribute {
+    val ATTRIBUTE_ID: UInt = 4u
+
+    val attributePath =
+      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+
+    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
+
+    val response = controller.read(readRequest)
+
+    if (response.successes.isEmpty()) {
+      logger.log(Level.WARNING, "Read command failed")
+      throw IllegalStateException("Read command failed with failures: ${response.failures}")
+    }
+
+    logger.log(Level.FINE, "Read command succeeded")
+
+    val attributeData =
+      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
+        it.path.attributeId == ATTRIBUTE_ID
+      }
+
+    requireNotNull(attributeData) { "Groupcastadoption attribute not found in response" }
+
+    // Decode the TLV data into the appropriate type
+    val tlvReader = TlvReader(attributeData.data)
+    val decodedValue: List<GroupKeyManagementClusterGroupcastAdoptionStruct>? =
+      if (tlvReader.isNextTag(AnonymousTag)) {
+        buildList<GroupKeyManagementClusterGroupcastAdoptionStruct> {
+          tlvReader.enterArray(AnonymousTag)
+          while (!tlvReader.isEndOfContainer()) {
+            add(GroupKeyManagementClusterGroupcastAdoptionStruct.fromTlv(AnonymousTag, tlvReader))
+          }
+          tlvReader.exitContainer()
+        }
+      } else {
+        null
+      }
+
+    return GroupcastAdoptionAttribute(decodedValue)
+  }
+
+  suspend fun writeGroupcastAdoptionAttribute(
+    value: List<GroupKeyManagementClusterGroupcastAdoptionStruct>,
+    timedWriteTimeout: Duration? = null,
+  ) {
+    val ATTRIBUTE_ID: UInt = 4u
+
+    val tlvWriter = TlvWriter()
+    tlvWriter.startArray(AnonymousTag)
+    for (item in value.iterator()) {
+      item.toTlv(AnonymousTag, tlvWriter)
+    }
+    tlvWriter.endArray()
+
+    val writeRequests: WriteRequests =
+      WriteRequests(
+        requests =
+          listOf(
+            WriteRequest(
+              attributePath =
+                AttributePath(endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID),
+              tlvPayload = tlvWriter.getEncoded(),
+            )
+          ),
+        timedRequest = timedWriteTimeout,
+      )
+
+    val response: WriteResponse = controller.write(writeRequests)
+
+    when (response) {
+      is WriteResponse.Success -> {
+        logger.log(Level.FINE, "Write command succeeded")
+      }
+      is WriteResponse.PartialWriteFailure -> {
+        val aggregatedErrorMessage =
+          response.failures.joinToString("\n") { failure ->
+            "Error at ${failure.attributePath}: ${failure.ex.message}"
+          }
+
+        response.failures.forEach { failure ->
+          logger.log(Level.WARNING, "Error at ${failure.attributePath}: ${failure.ex.message}")
+        }
+
+        throw IllegalStateException("Write command failed with errors: \n$aggregatedErrorMessage")
+      }
+    }
+  }
+
+  suspend fun subscribeGroupcastAdoptionAttribute(
+    minInterval: Int,
+    maxInterval: Int,
+  ): Flow<GroupcastAdoptionAttributeSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 4u
+    val attributePaths =
+      listOf(
+        AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+      )
+
+    val subscribeRequest: SubscribeRequest =
+      SubscribeRequest(
+        eventPaths = emptyList(),
+        attributePaths = attributePaths,
+        minInterval = Duration.ofSeconds(minInterval.toLong()),
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
+      )
+
+    return controller.subscribe(subscribeRequest).transform { subscriptionState ->
+      when (subscriptionState) {
+        is SubscriptionState.SubscriptionErrorNotification -> {
+          emit(
+            GroupcastAdoptionAttributeSubscriptionState.Error(
+              Exception(
+                "Subscription terminated with error code: ${subscriptionState.terminationCause}"
+              )
+            )
+          )
+        }
+        is SubscriptionState.NodeStateUpdate -> {
+          val attributeData =
+            subscriptionState.updateState.successes
+              .filterIsInstance<ReadData.Attribute>()
+              .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
+
+          requireNotNull(attributeData) {
+            "Groupcastadoption attribute not found in Node State update"
+          }
+
+          // Decode the TLV data into the appropriate type
+          val tlvReader = TlvReader(attributeData.data)
+          val decodedValue: List<GroupKeyManagementClusterGroupcastAdoptionStruct>? =
+            if (tlvReader.isNextTag(AnonymousTag)) {
+              buildList<GroupKeyManagementClusterGroupcastAdoptionStruct> {
+                tlvReader.enterArray(AnonymousTag)
+                while (!tlvReader.isEndOfContainer()) {
+                  add(
+                    GroupKeyManagementClusterGroupcastAdoptionStruct.fromTlv(
+                      AnonymousTag,
+                      tlvReader,
+                    )
+                  )
+                }
+                tlvReader.exitContainer()
+              }
+            } else {
+              null
+            }
+
+          decodedValue?.let { emit(GroupcastAdoptionAttributeSubscriptionState.Success(it)) }
+        }
+        SubscriptionState.SubscriptionEstablished -> {
+          emit(GroupcastAdoptionAttributeSubscriptionState.SubscriptionEstablished)
+        }
+      }
+    }
+  }
+
   suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     val ATTRIBUTE_ID: UInt = 65528u
 
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
index 5dfddfd69cc..7d9500746dc 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
@@ -1287,6 +1287,97 @@ class SmokeCoAlarmCluster(
     }
   }
 
+  suspend fun readUnmountedAttribute(): Boolean? {
+    val ATTRIBUTE_ID: UInt = 13u
+
+    val attributePath =
+      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+
+    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
+
+    val response = controller.read(readRequest)
+
+    if (response.successes.isEmpty()) {
+      logger.log(Level.WARNING, "Read command failed")
+      throw IllegalStateException("Read command failed with failures: ${response.failures}")
+    }
+
+    logger.log(Level.FINE, "Read command succeeded")
+
+    val attributeData =
+      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
+        it.path.attributeId == ATTRIBUTE_ID
+      }
+
+    requireNotNull(attributeData) { "Unmounted attribute not found in response" }
+
+    // Decode the TLV data into the appropriate type
+    val tlvReader = TlvReader(attributeData.data)
+    val decodedValue: Boolean? =
+      if (tlvReader.isNextTag(AnonymousTag)) {
+        tlvReader.getBoolean(AnonymousTag)
+      } else {
+        null
+      }
+
+    return decodedValue
+  }
+
+  suspend fun subscribeUnmountedAttribute(
+    minInterval: Int,
+    maxInterval: Int,
+  ): Flow<BooleanSubscriptionState> {
+    val ATTRIBUTE_ID: UInt = 13u
+    val attributePaths =
+      listOf(
+        AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
+      )
+
+    val subscribeRequest: SubscribeRequest =
+      SubscribeRequest(
+        eventPaths = emptyList(),
+        attributePaths = attributePaths,
+        minInterval = Duration.ofSeconds(minInterval.toLong()),
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
+      )
+
+    return controller.subscribe(subscribeRequest).transform { subscriptionState ->
+      when (subscriptionState) {
+        is SubscriptionState.SubscriptionErrorNotification -> {
+          emit(
+            BooleanSubscriptionState.Error(
+              Exception(
+                "Subscription terminated with error code: ${subscriptionState.terminationCause}"
+              )
+            )
+          )
+        }
+        is SubscriptionState.NodeStateUpdate -> {
+          val attributeData =
+            subscriptionState.updateState.successes
+              .filterIsInstance<ReadData.Attribute>()
+              .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
+
+          requireNotNull(attributeData) { "Unmounted attribute not found in Node State update" }
+
+          // Decode the TLV data into the appropriate type
+          val tlvReader = TlvReader(attributeData.data)
+          val decodedValue: Boolean? =
+            if (tlvReader.isNextTag(AnonymousTag)) {
+              tlvReader.getBoolean(AnonymousTag)
+            } else {
+              null
+            }
+
+          decodedValue?.let { emit(BooleanSubscriptionState.Success(it)) }
+        }
+        SubscriptionState.SubscriptionEstablished -> {
+          emit(BooleanSubscriptionState.SubscriptionEstablished)
+        }
+      }
+    }
+  }
+
   suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     val ATTRIBUTE_ID: UInt = 65528u
 
diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt
new file mode 100644
index 00000000000..df2db3bf97d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt
@@ -0,0 +1,55 @@
+/*
+ *
+ *    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.
+ */
+package matter.controller.cluster.eventstructs
+
+import matter.controller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterAmbientContextDetectEndedEvent(val startEventNumber: ULong) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterAmbientContextDetectEndedEvent {\n")
+    append("\tstartEventNumber : $startEventNumber\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_START_EVENT_NUMBER), startEventNumber)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_START_EVENT_NUMBER = 0
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterAmbientContextDetectEndedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val startEventNumber = tlvReader.getULong(ContextSpecificTag(TAG_START_EVENT_NUMBER))
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterAmbientContextDetectEndedEvent(startEventNumber)
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt
new file mode 100644
index 00000000000..d1fce95cfab
--- /dev/null
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt
@@ -0,0 +1,104 @@
+/*
+ *
+ *    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.
+ */
+package matter.controller.cluster.eventstructs
+
+import java.util.Optional
+import matter.controller.cluster.*
+import matter.tlv.AnonymousTag
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+  val ambientContextType:
+    Optional<
+      List<matter.controller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct>
+    >,
+  val objectCount: Optional<UShort>,
+) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterAmbientContextDetectStartedEvent {\n")
+    append("\tambientContextType : $ambientContextType\n")
+    append("\tobjectCount : $objectCount\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      if (ambientContextType.isPresent) {
+        val optambientContextType = ambientContextType.get()
+        startArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
+        for (item in optambientContextType.iterator()) {
+          item.toTlv(AnonymousTag, this)
+        }
+        endArray()
+      }
+      if (objectCount.isPresent) {
+        val optobjectCount = objectCount.get()
+        put(ContextSpecificTag(TAG_OBJECT_COUNT), optobjectCount)
+      }
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_AMBIENT_CONTEXT_TYPE = 0
+    private const val TAG_OBJECT_COUNT = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterAmbientContextDetectStartedEvent {
+      tlvReader.enterStructure(tlvTag)
+      val ambientContextType =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))) {
+          Optional.of(
+            buildList<
+              matter.controller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
+            > {
+              tlvReader.enterArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
+              while (!tlvReader.isEndOfContainer()) {
+                this.add(
+                  matter.controller.cluster.structs
+                    .AmbientContextSensingClusterAmbientContextTypeStruct
+                    .fromTlv(AnonymousTag, tlvReader)
+                )
+              }
+              tlvReader.exitContainer()
+            }
+          )
+        } else {
+          Optional.empty()
+        }
+      val objectCount =
+        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT))) {
+          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_OBJECT_COUNT)))
+        } else {
+          Optional.empty()
+        }
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterAmbientContextDetectStartedEvent(
+        ambientContextType,
+        objectCount,
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt
deleted file mode 100644
index 8b357a9112d..00000000000
--- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt
+++ /dev/null
@@ -1,75 +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.
- */
-package matter.controller.cluster.eventstructs
-
-import matter.controller.cluster.*
-import matter.tlv.AnonymousTag
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class AmbientContextSensingClusterAmbientContextDetectedEvent(
-  val ambientContextType:
-    List<matter.controller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct>
-) {
-  override fun toString(): String = buildString {
-    append("AmbientContextSensingClusterAmbientContextDetectedEvent {\n")
-    append("\tambientContextType : $ambientContextType\n")
-    append("}\n")
-  }
-
-  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
-    tlvWriter.apply {
-      startStructure(tlvTag)
-      startArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
-      for (item in ambientContextType.iterator()) {
-        item.toTlv(AnonymousTag, this)
-      }
-      endArray()
-      endStructure()
-    }
-  }
-
-  companion object {
-    private const val TAG_AMBIENT_CONTEXT_TYPE = 0
-
-    fun fromTlv(
-      tlvTag: Tag,
-      tlvReader: TlvReader,
-    ): AmbientContextSensingClusterAmbientContextDetectedEvent {
-      tlvReader.enterStructure(tlvTag)
-      val ambientContextType =
-        buildList<
-          matter.controller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
-        > {
-          tlvReader.enterArray(ContextSpecificTag(TAG_AMBIENT_CONTEXT_TYPE))
-          while (!tlvReader.isEndOfContainer()) {
-            this.add(
-              matter.controller.cluster.structs.AmbientContextSensingClusterAmbientContextTypeStruct
-                .fromTlv(AnonymousTag, tlvReader)
-            )
-          }
-          tlvReader.exitContainer()
-        }
-
-      tlvReader.exitContainer()
-
-      return AmbientContextSensingClusterAmbientContextDetectedEvent(ambientContextType)
-    }
-  }
-}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni
index b2561334b8a..dce4dcfb976 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/files.gni
+++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni
@@ -13,6 +13,7 @@ matter_structs_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterHoldTimeLimitsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterPredictedActivityStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterSemanticTagStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt",
@@ -117,6 +118,7 @@ matter_structs_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterDeviceLoadStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupcastClusterMembershipStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt",
@@ -251,7 +253,8 @@ matter_eventstructs_sources = [
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectEndedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AmbientContextSensingClusterAmbientContextDetectStartedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
   "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
index 6e37dfc7f18..cd2b0f93518 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterAmbientContextTypeStruct.kt
@@ -27,15 +27,11 @@ import matter.tlv.TlvWriter
 class AmbientContextSensingClusterAmbientContextTypeStruct(
   val ambientContextSensed: List<AmbientContextSensingClusterSemanticTagStruct>,
   val detectionStartTime: Optional<UInt>,
-  val objectCountThreshold: Optional<UShort>,
-  val objectCount: Optional<UShort>,
 ) {
   override fun toString(): String = buildString {
     append("AmbientContextSensingClusterAmbientContextTypeStruct {\n")
     append("\tambientContextSensed : $ambientContextSensed\n")
     append("\tdetectionStartTime : $detectionStartTime\n")
-    append("\tobjectCountThreshold : $objectCountThreshold\n")
-    append("\tobjectCount : $objectCount\n")
     append("}\n")
   }
 
@@ -51,14 +47,6 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
         val optdetectionStartTime = detectionStartTime.get()
         put(ContextSpecificTag(TAG_DETECTION_START_TIME), optdetectionStartTime)
       }
-      if (objectCountThreshold.isPresent) {
-        val optobjectCountThreshold = objectCountThreshold.get()
-        put(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD), optobjectCountThreshold)
-      }
-      if (objectCount.isPresent) {
-        val optobjectCount = objectCount.get()
-        put(ContextSpecificTag(TAG_OBJECT_COUNT), optobjectCount)
-      }
       endStructure()
     }
   }
@@ -66,8 +54,6 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
   companion object {
     private const val TAG_AMBIENT_CONTEXT_SENSED = 0
     private const val TAG_DETECTION_START_TIME = 1
-    private const val TAG_OBJECT_COUNT_THRESHOLD = 2
-    private const val TAG_OBJECT_COUNT = 3
 
     fun fromTlv(
       tlvTag: Tag,
@@ -88,26 +74,12 @@ class AmbientContextSensingClusterAmbientContextTypeStruct(
         } else {
           Optional.empty()
         }
-      val objectCountThreshold =
-        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD))) {
-          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD)))
-        } else {
-          Optional.empty()
-        }
-      val objectCount =
-        if (tlvReader.isNextTag(ContextSpecificTag(TAG_OBJECT_COUNT))) {
-          Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_OBJECT_COUNT)))
-        } else {
-          Optional.empty()
-        }
 
       tlvReader.exitContainer()
 
       return AmbientContextSensingClusterAmbientContextTypeStruct(
         ambientContextSensed,
         detectionStartTime,
-        objectCountThreshold,
-        objectCount,
       )
     }
   }
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt
new file mode 100644
index 00000000000..c7d8f206cab
--- /dev/null
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AmbientContextSensingClusterObjectCountConfigStruct.kt
@@ -0,0 +1,69 @@
+/*
+ *
+ *    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.
+ */
+package matter.controller.cluster.structs
+
+import matter.controller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class AmbientContextSensingClusterObjectCountConfigStruct(
+  val countingObject: AmbientContextSensingClusterSemanticTagStruct,
+  val objectCountThreshold: UShort,
+) {
+  override fun toString(): String = buildString {
+    append("AmbientContextSensingClusterObjectCountConfigStruct {\n")
+    append("\tcountingObject : $countingObject\n")
+    append("\tobjectCountThreshold : $objectCountThreshold\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      countingObject.toTlv(ContextSpecificTag(TAG_COUNTING_OBJECT), this)
+      put(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD), objectCountThreshold)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_COUNTING_OBJECT = 0
+    private const val TAG_OBJECT_COUNT_THRESHOLD = 1
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): AmbientContextSensingClusterObjectCountConfigStruct {
+      tlvReader.enterStructure(tlvTag)
+      val countingObject =
+        AmbientContextSensingClusterSemanticTagStruct.fromTlv(
+          ContextSpecificTag(TAG_COUNTING_OBJECT),
+          tlvReader,
+        )
+      val objectCountThreshold = tlvReader.getUShort(ContextSpecificTag(TAG_OBJECT_COUNT_THRESHOLD))
+
+      tlvReader.exitContainer()
+
+      return AmbientContextSensingClusterObjectCountConfigStruct(
+        countingObject,
+        objectCountThreshold,
+      )
+    }
+  }
+}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
index 1419d29377c..881f17eaec6 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
@@ -31,6 +31,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
   val epochStartTime1: ULong?,
   val epochKey2: ByteArray?,
   val epochStartTime2: ULong?,
+  val groupKeyMulticastPolicy: UByte,
 ) {
   override fun toString(): String = buildString {
     append("GroupKeyManagementClusterGroupKeySetStruct {\n")
@@ -42,6 +43,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
     append("\tepochStartTime1 : $epochStartTime1\n")
     append("\tepochKey2 : $epochKey2\n")
     append("\tepochStartTime2 : $epochStartTime2\n")
+    append("\tgroupKeyMulticastPolicy : $groupKeyMulticastPolicy\n")
     append("}\n")
   }
 
@@ -80,6 +82,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
       } else {
         putNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
       }
+      put(ContextSpecificTag(TAG_GROUP_KEY_MULTICAST_POLICY), groupKeyMulticastPolicy)
       endStructure()
     }
   }
@@ -93,6 +96,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
     private const val TAG_EPOCH_START_TIME1 = 5
     private const val TAG_EPOCH_KEY2 = 6
     private const val TAG_EPOCH_START_TIME2 = 7
+    private const val TAG_GROUP_KEY_MULTICAST_POLICY = 8
 
     fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): GroupKeyManagementClusterGroupKeySetStruct {
       tlvReader.enterStructure(tlvTag)
@@ -141,6 +145,8 @@ class GroupKeyManagementClusterGroupKeySetStruct(
           tlvReader.getNull(ContextSpecificTag(TAG_EPOCH_START_TIME2))
           null
         }
+      val groupKeyMulticastPolicy =
+        tlvReader.getUByte(ContextSpecificTag(TAG_GROUP_KEY_MULTICAST_POLICY))
 
       tlvReader.exitContainer()
 
@@ -153,6 +159,7 @@ class GroupKeyManagementClusterGroupKeySetStruct(
         epochStartTime1,
         epochKey2,
         epochStartTime2,
+        groupKeyMulticastPolicy,
       )
     }
   }
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt
new file mode 100644
index 00000000000..a7e562aa196
--- /dev/null
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupcastAdoptionStruct.kt
@@ -0,0 +1,62 @@
+/*
+ *
+ *    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.
+ */
+package matter.controller.cluster.structs
+
+import matter.controller.cluster.*
+import matter.tlv.ContextSpecificTag
+import matter.tlv.Tag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
+
+class GroupKeyManagementClusterGroupcastAdoptionStruct(
+  val groupcastAdopted: Boolean,
+  val fabricIndex: UByte,
+) {
+  override fun toString(): String = buildString {
+    append("GroupKeyManagementClusterGroupcastAdoptionStruct {\n")
+    append("\tgroupcastAdopted : $groupcastAdopted\n")
+    append("\tfabricIndex : $fabricIndex\n")
+    append("}\n")
+  }
+
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
+    tlvWriter.apply {
+      startStructure(tlvTag)
+      put(ContextSpecificTag(TAG_GROUPCAST_ADOPTED), groupcastAdopted)
+      put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
+      endStructure()
+    }
+  }
+
+  companion object {
+    private const val TAG_GROUPCAST_ADOPTED = 0
+    private const val TAG_FABRIC_INDEX = 254
+
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader,
+    ): GroupKeyManagementClusterGroupcastAdoptionStruct {
+      tlvReader.enterStructure(tlvTag)
+      val groupcastAdopted = tlvReader.getBoolean(ContextSpecificTag(TAG_GROUPCAST_ADOPTED))
+      val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
+
+      tlvReader.exitContainer()
+
+      return GroupKeyManagementClusterGroupcastAdoptionStruct(groupcastAdopted, fabricIndex)
+    }
+  }
+}
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index fd79ec8a3e0..40f4d052b65 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -10938,6 +10938,66 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
             return value;
         }
+        case Attributes::GroupcastAdoption::Id: {
+            using TypeInfo = Attributes::GroupcastAdoption::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_groupcastAdopted;
+                std::string newElement_0_groupcastAdoptedClassName     = "java/lang/Boolean";
+                std::string newElement_0_groupcastAdoptedCtorSignature = "(Z)V";
+                jboolean jninewElement_0_groupcastAdopted              = static_cast<jboolean>(entry_0.groupcastAdopted);
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(
+                    newElement_0_groupcastAdoptedClassName.c_str(), newElement_0_groupcastAdoptedCtorSignature.c_str(),
+                    jninewElement_0_groupcastAdopted, newElement_0_groupcastAdopted);
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                jint jninewElement_0_fabricIndex                  = static_cast<jint>(entry_0.fabricIndex);
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    newElement_0_fabricIndexClassName.c_str(), newElement_0_fabricIndexCtorSignature.c_str(),
+                    jninewElement_0_fabricIndex, newElement_0_fabricIndex);
+
+                {
+                    jclass groupcastAdoptionStructStructClass_1;
+                    err = chip::JniReferences::GetInstance().GetLocalClassRef(
+                        env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupcastAdoptionStruct",
+                        groupcastAdoptionStructStructClass_1);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupcastAdoptionStruct");
+                        return nullptr;
+                    }
+
+                    jmethodID groupcastAdoptionStructStructCtor_1;
+                    err = chip::JniReferences::GetInstance().FindMethod(env, groupcastAdoptionStructStructClass_1, "<init>",
+                                                                        "(Ljava/lang/Boolean;Ljava/lang/Integer;)V",
+                                                                        &groupcastAdoptionStructStructCtor_1);
+                    if (err != CHIP_NO_ERROR || groupcastAdoptionStructStructCtor_1 == nullptr)
+                    {
+                        ChipLogError(Zcl,
+                                     "Could not find ChipStructs$GroupKeyManagementClusterGroupcastAdoptionStruct constructor");
+                        return nullptr;
+                    }
+
+                    newElement_0 = env->NewObject(groupcastAdoptionStructStructClass_1, groupcastAdoptionStructStructCtor_1,
+                                                  newElement_0_groupcastAdopted, newElement_0_fabricIndex);
+                }
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -15607,6 +15667,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
             return value;
         }
+        case Attributes::Unmounted::Id: {
+            using TypeInfo = Attributes::Unmounted::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(
+                valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -38153,44 +38229,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
                         newElement_0_detectionStartTimeInsideOptional, newElement_0_detectionStartTime);
                 }
-                jobject newElement_0_objectCountThreshold;
-                if (!entry_0.objectCountThreshold.HasValue())
-                {
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr,
-                                                                                               newElement_0_objectCountThreshold);
-                }
-                else
-                {
-                    jobject newElement_0_objectCountThresholdInsideOptional;
-                    std::string newElement_0_objectCountThresholdInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_objectCountThresholdInsideOptionalCtorSignature = "(I)V";
-                    jint jninewElement_0_objectCountThresholdInsideOptional =
-                        static_cast<jint>(entry_0.objectCountThreshold.Value());
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_0_objectCountThresholdInsideOptionalClassName.c_str(),
-                        newElement_0_objectCountThresholdInsideOptionalCtorSignature.c_str(),
-                        jninewElement_0_objectCountThresholdInsideOptional, newElement_0_objectCountThresholdInsideOptional);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_objectCountThresholdInsideOptional, newElement_0_objectCountThreshold);
-                }
-                jobject newElement_0_objectCount;
-                if (!entry_0.objectCount.HasValue())
-                {
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_objectCount);
-                }
-                else
-                {
-                    jobject newElement_0_objectCountInsideOptional;
-                    std::string newElement_0_objectCountInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_objectCountInsideOptionalCtorSignature = "(I)V";
-                    jint jninewElement_0_objectCountInsideOptional = static_cast<jint>(entry_0.objectCount.Value());
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_0_objectCountInsideOptionalClassName.c_str(),
-                        newElement_0_objectCountInsideOptionalCtorSignature.c_str(), jninewElement_0_objectCountInsideOptional,
-                        newElement_0_objectCountInsideOptional);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_objectCountInsideOptional, newElement_0_objectCount);
-                }
 
                 {
                     jclass ambientContextTypeStructStructClass_1;
@@ -38204,10 +38242,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     }
 
                     jmethodID ambientContextTypeStructStructCtor_1;
-                    err = chip::JniReferences::GetInstance().FindMethod(
-                        env, ambientContextTypeStructStructClass_1, "<init>",
-                        "(Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
-                        &ambientContextTypeStructStructCtor_1);
+                    err = chip::JniReferences::GetInstance().FindMethod(env, ambientContextTypeStructStructClass_1, "<init>",
+                                                                        "(Ljava/util/ArrayList;Ljava/util/Optional;)V",
+                                                                        &ambientContextTypeStructStructCtor_1);
                     if (err != CHIP_NO_ERROR || ambientContextTypeStructStructCtor_1 == nullptr)
                     {
                         ChipLogError(Zcl,
@@ -38216,8 +38253,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     }
 
                     newElement_0 = env->NewObject(ambientContextTypeStructStructClass_1, ambientContextTypeStructStructCtor_1,
-                                                  newElement_0_ambientContextSensed, newElement_0_detectionStartTime,
-                                                  newElement_0_objectCountThreshold, newElement_0_objectCount);
+                                                  newElement_0_ambientContextSensed, newElement_0_detectionStartTime);
                 }
                 TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
@@ -38318,8 +38354,144 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::SimultaneousDetectionLimit::Id: {
-            using TypeInfo = Attributes::SimultaneousDetectionLimit::TypeInfo;
+        case Attributes::ObjectCountReached::Id: {
+            using TypeInfo = Attributes::ObjectCountReached::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            jboolean jnivalue              = static_cast<jboolean>(cppValue);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(
+                valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
+            return value;
+        }
+        case Attributes::ObjectCountConfig::Id: {
+            using TypeInfo = Attributes::ObjectCountConfig::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_countingObject;
+            jobject value_countingObject_mfgCode;
+            if (cppValue.countingObject.mfgCode.IsNull())
+            {
+                value_countingObject_mfgCode = nullptr;
+            }
+            else
+            {
+                std::string value_countingObject_mfgCodeClassName     = "java/lang/Integer";
+                std::string value_countingObject_mfgCodeCtorSignature = "(I)V";
+                jint jnivalue_countingObject_mfgCode                  = static_cast<jint>(cppValue.countingObject.mfgCode.Value());
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    value_countingObject_mfgCodeClassName.c_str(), value_countingObject_mfgCodeCtorSignature.c_str(),
+                    jnivalue_countingObject_mfgCode, value_countingObject_mfgCode);
+            }
+            jobject value_countingObject_namespaceID;
+            std::string value_countingObject_namespaceIDClassName     = "java/lang/Integer";
+            std::string value_countingObject_namespaceIDCtorSignature = "(I)V";
+            jint jnivalue_countingObject_namespaceID                  = static_cast<jint>(cppValue.countingObject.namespaceID);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_countingObject_namespaceIDClassName.c_str(), value_countingObject_namespaceIDCtorSignature.c_str(),
+                jnivalue_countingObject_namespaceID, value_countingObject_namespaceID);
+            jobject value_countingObject_tag;
+            std::string value_countingObject_tagClassName     = "java/lang/Integer";
+            std::string value_countingObject_tagCtorSignature = "(I)V";
+            jint jnivalue_countingObject_tag                  = static_cast<jint>(cppValue.countingObject.tag);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_countingObject_tagClassName.c_str(), value_countingObject_tagCtorSignature.c_str(),
+                jnivalue_countingObject_tag, value_countingObject_tag);
+            jobject value_countingObject_label;
+            if (!cppValue.countingObject.label.HasValue())
+            {
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, value_countingObject_label);
+            }
+            else
+            {
+                jobject value_countingObject_labelInsideOptional;
+                if (cppValue.countingObject.label.Value().IsNull())
+                {
+                    value_countingObject_labelInsideOptional = nullptr;
+                }
+                else
+                {
+                    LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                        cppValue.countingObject.label.Value().Value(), value_countingObject_labelInsideOptional));
+                }
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(value_countingObject_labelInsideOptional,
+                                                                                           value_countingObject_label);
+            }
+
+            {
+                jclass semanticTagStructStructClass_1;
+                err = chip::JniReferences::GetInstance().GetLocalClassRef(
+                    env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterSemanticTagStruct",
+                    semanticTagStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AmbientContextSensingClusterSemanticTagStruct");
+                    return nullptr;
+                }
+
+                jmethodID semanticTagStructStructCtor_1;
+                err = chip::JniReferences::GetInstance().FindMethod(
+                    env, semanticTagStructStructClass_1, "<init>",
+                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V",
+                    &semanticTagStructStructCtor_1);
+                if (err != CHIP_NO_ERROR || semanticTagStructStructCtor_1 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$AmbientContextSensingClusterSemanticTagStruct constructor");
+                    return nullptr;
+                }
+
+                value_countingObject =
+                    env->NewObject(semanticTagStructStructClass_1, semanticTagStructStructCtor_1, value_countingObject_mfgCode,
+                                   value_countingObject_namespaceID, value_countingObject_tag, value_countingObject_label);
+            }
+            jobject value_objectCountThreshold;
+            std::string value_objectCountThresholdClassName     = "java/lang/Integer";
+            std::string value_objectCountThresholdCtorSignature = "(I)V";
+            jint jnivalue_objectCountThreshold                  = static_cast<jint>(cppValue.objectCountThreshold);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                value_objectCountThresholdClassName.c_str(), value_objectCountThresholdCtorSignature.c_str(),
+                jnivalue_objectCountThreshold, value_objectCountThreshold);
+
+            {
+                jclass objectCountConfigStructStructClass_0;
+                err = chip::JniReferences::GetInstance().GetLocalClassRef(
+                    env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterObjectCountConfigStruct",
+                    objectCountConfigStructStructClass_0);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AmbientContextSensingClusterObjectCountConfigStruct");
+                    return nullptr;
+                }
+
+                jmethodID objectCountConfigStructStructCtor_0;
+                err = chip::JniReferences::GetInstance().FindMethod(
+                    env, objectCountConfigStructStructClass_0, "<init>",
+                    "(Lchip/devicecontroller/ChipStructs$AmbientContextSensingClusterSemanticTagStruct;Ljava/lang/Integer;)V",
+                    &objectCountConfigStructStructCtor_0);
+                if (err != CHIP_NO_ERROR || objectCountConfigStructStructCtor_0 == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$AmbientContextSensingClusterObjectCountConfigStruct constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(objectCountConfigStructStructClass_0, objectCountConfigStructStructCtor_0,
+                                       value_countingObject, value_objectCountThreshold);
+            }
+            return value;
+        }
+        case Attributes::ObjectCount::Id: {
+            using TypeInfo = Attributes::ObjectCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -38334,8 +38506,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
             return value;
         }
-        case Attributes::ObjectCountReached::Id: {
-            using TypeInfo = Attributes::ObjectCountReached::TypeInfo;
+        case Attributes::SimultaneousDetectionLimit::Id: {
+            using TypeInfo = Attributes::SimultaneousDetectionLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -38343,10 +38515,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            jboolean jnivalue              = static_cast<jboolean>(cppValue);
-            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jboolean>(
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            jint jnivalue                  = static_cast<jint>(cppValue);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
                 valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, value);
             return value;
         }
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index 54c13183dd9..6e5d373d5cc 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -8926,218 +8926,253 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
         using namespace app::Clusters::AmbientContextSensing;
         switch (aPath.mEventId)
         {
-        case Events::AmbientContextDetected::Id: {
-            Events::AmbientContextDetected::DecodableType cppValue;
+        case Events::AmbientContextDetectStarted::Id: {
+            Events::AmbientContextDetectStarted::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
             {
                 return nullptr;
             }
             jobject value_ambientContextType;
-            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(value_ambientContextType);
-
-            auto iter_value_ambientContextType_0 = cppValue.ambientContextType.begin();
-            while (iter_value_ambientContextType_0.Next())
+            if (!cppValue.ambientContextType.HasValue())
             {
-                auto & entry_0 = iter_value_ambientContextType_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_ambientContextSensed;
-                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(newElement_0_ambientContextSensed);
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, value_ambientContextType);
+            }
+            else
+            {
+                jobject value_ambientContextTypeInsideOptional;
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(value_ambientContextTypeInsideOptional);
 
-                auto iter_newElement_0_ambientContextSensed_2 = entry_0.ambientContextSensed.begin();
-                while (iter_newElement_0_ambientContextSensed_2.Next())
+                auto iter_value_ambientContextTypeInsideOptional_1 = cppValue.ambientContextType.Value().begin();
+                while (iter_value_ambientContextTypeInsideOptional_1.Next())
                 {
-                    auto & entry_2 = iter_newElement_0_ambientContextSensed_2.GetValue();
-                    jobject newElement_2;
-                    jobject newElement_2_mfgCode;
-                    if (entry_2.mfgCode.IsNull())
-                    {
-                        newElement_2_mfgCode = nullptr;
-                    }
-                    else
+                    auto & entry_1 = iter_value_ambientContextTypeInsideOptional_1.GetValue();
+                    jobject newElement_1;
+                    jobject newElement_1_ambientContextSensed;
+                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(newElement_1_ambientContextSensed);
+
+                    auto iter_newElement_1_ambientContextSensed_3 = entry_1.ambientContextSensed.begin();
+                    while (iter_newElement_1_ambientContextSensed_3.Next())
                     {
-                        std::string newElement_2_mfgCodeClassName     = "java/lang/Integer";
-                        std::string newElement_2_mfgCodeCtorSignature = "(I)V";
-                        jint jninewElement_2_mfgCode                  = static_cast<jint>(entry_2.mfgCode.Value());
+                        auto & entry_3 = iter_newElement_1_ambientContextSensed_3.GetValue();
+                        jobject newElement_3;
+                        jobject newElement_3_mfgCode;
+                        if (entry_3.mfgCode.IsNull())
+                        {
+                            newElement_3_mfgCode = nullptr;
+                        }
+                        else
+                        {
+                            std::string newElement_3_mfgCodeClassName     = "java/lang/Integer";
+                            std::string newElement_3_mfgCodeCtorSignature = "(I)V";
+                            jint jninewElement_3_mfgCode                  = static_cast<jint>(entry_3.mfgCode.Value());
+                            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                                newElement_3_mfgCodeClassName.c_str(), newElement_3_mfgCodeCtorSignature.c_str(),
+                                jninewElement_3_mfgCode, newElement_3_mfgCode);
+                        }
+                        jobject newElement_3_namespaceID;
+                        std::string newElement_3_namespaceIDClassName     = "java/lang/Integer";
+                        std::string newElement_3_namespaceIDCtorSignature = "(I)V";
+                        jint jninewElement_3_namespaceID                  = static_cast<jint>(entry_3.namespaceID);
                         TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                            newElement_2_mfgCodeClassName.c_str(), newElement_2_mfgCodeCtorSignature.c_str(),
-                            jninewElement_2_mfgCode, newElement_2_mfgCode);
-                    }
-                    jobject newElement_2_namespaceID;
-                    std::string newElement_2_namespaceIDClassName     = "java/lang/Integer";
-                    std::string newElement_2_namespaceIDCtorSignature = "(I)V";
-                    jint jninewElement_2_namespaceID                  = static_cast<jint>(entry_2.namespaceID);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_2_namespaceIDClassName.c_str(), newElement_2_namespaceIDCtorSignature.c_str(),
-                        jninewElement_2_namespaceID, newElement_2_namespaceID);
-                    jobject newElement_2_tag;
-                    std::string newElement_2_tagClassName     = "java/lang/Integer";
-                    std::string newElement_2_tagCtorSignature = "(I)V";
-                    jint jninewElement_2_tag                  = static_cast<jint>(entry_2.tag);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_2_tagClassName.c_str(), newElement_2_tagCtorSignature.c_str(), jninewElement_2_tag,
-                        newElement_2_tag);
-                    jobject newElement_2_label;
-                    if (!entry_2.label.HasValue())
-                    {
-                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_label);
-                    }
-                    else
-                    {
-                        jobject newElement_2_labelInsideOptional;
-                        if (entry_2.label.Value().IsNull())
+                            newElement_3_namespaceIDClassName.c_str(), newElement_3_namespaceIDCtorSignature.c_str(),
+                            jninewElement_3_namespaceID, newElement_3_namespaceID);
+                        jobject newElement_3_tag;
+                        std::string newElement_3_tagClassName     = "java/lang/Integer";
+                        std::string newElement_3_tagCtorSignature = "(I)V";
+                        jint jninewElement_3_tag                  = static_cast<jint>(entry_3.tag);
+                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                            newElement_3_tagClassName.c_str(), newElement_3_tagCtorSignature.c_str(), jninewElement_3_tag,
+                            newElement_3_tag);
+                        jobject newElement_3_label;
+                        if (!entry_3.label.HasValue())
                         {
-                            newElement_2_labelInsideOptional = nullptr;
+                            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_3_label);
                         }
                         else
                         {
-                            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.label.Value().Value(),
-                                                                                                 newElement_2_labelInsideOptional));
+                            jobject newElement_3_labelInsideOptional;
+                            if (entry_3.label.Value().IsNull())
+                            {
+                                newElement_3_labelInsideOptional = nullptr;
+                            }
+                            else
+                            {
+                                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(
+                                    entry_3.label.Value().Value(), newElement_3_labelInsideOptional));
+                            }
+                            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
+                                newElement_3_labelInsideOptional, newElement_3_label);
+                        }
+
+                        {
+                            jclass semanticTagStructStructClass_4;
+                            err = chip::JniReferences::GetInstance().GetLocalClassRef(
+                                env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterSemanticTagStruct",
+                                semanticTagStructStructClass_4);
+                            if (err != CHIP_NO_ERROR)
+                            {
+                                ChipLogError(Zcl, "Could not find class ChipStructs$AmbientContextSensingClusterSemanticTagStruct");
+                                return nullptr;
+                            }
+
+                            jmethodID semanticTagStructStructCtor_4;
+                            err = chip::JniReferences::GetInstance().FindMethod(
+                                env, semanticTagStructStructClass_4, "<init>",
+                                "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V",
+                                &semanticTagStructStructCtor_4);
+                            if (err != CHIP_NO_ERROR || semanticTagStructStructCtor_4 == nullptr)
+                            {
+                                ChipLogError(
+                                    Zcl, "Could not find ChipStructs$AmbientContextSensingClusterSemanticTagStruct constructor");
+                                return nullptr;
+                            }
+
+                            newElement_3 =
+                                env->NewObject(semanticTagStructStructClass_4, semanticTagStructStructCtor_4, newElement_3_mfgCode,
+                                               newElement_3_namespaceID, newElement_3_tag, newElement_3_label);
                         }
-                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(newElement_2_labelInsideOptional,
-                                                                                                   newElement_2_label);
+                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(newElement_1_ambientContextSensed,
+                                                                                              newElement_3);
+                    }
+                    jobject newElement_1_detectionStartTime;
+                    if (!entry_1.detectionStartTime.HasValue())
+                    {
+                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr,
+                                                                                                   newElement_1_detectionStartTime);
+                    }
+                    else
+                    {
+                        jobject newElement_1_detectionStartTimeInsideOptional;
+                        std::string newElement_1_detectionStartTimeInsideOptionalClassName     = "java/lang/Long";
+                        std::string newElement_1_detectionStartTimeInsideOptionalCtorSignature = "(J)V";
+                        jlong jninewElement_1_detectionStartTimeInsideOptional =
+                            static_cast<jlong>(entry_1.detectionStartTime.Value());
+                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                            newElement_1_detectionStartTimeInsideOptionalClassName.c_str(),
+                            newElement_1_detectionStartTimeInsideOptionalCtorSignature.c_str(),
+                            jninewElement_1_detectionStartTimeInsideOptional, newElement_1_detectionStartTimeInsideOptional);
+                        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
+                            newElement_1_detectionStartTimeInsideOptional, newElement_1_detectionStartTime);
                     }
 
                     {
-                        jclass semanticTagStructStructClass_3;
+                        jclass ambientContextTypeStructStructClass_2;
                         err = chip::JniReferences::GetInstance().GetLocalClassRef(
-                            env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterSemanticTagStruct",
-                            semanticTagStructStructClass_3);
+                            env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct",
+                            ambientContextTypeStructStructClass_2);
                         if (err != CHIP_NO_ERROR)
                         {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$AmbientContextSensingClusterSemanticTagStruct");
+                            ChipLogError(Zcl,
+                                         "Could not find class ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct");
                             return nullptr;
                         }
 
-                        jmethodID semanticTagStructStructCtor_3;
-                        err = chip::JniReferences::GetInstance().FindMethod(
-                            env, semanticTagStructStructClass_3, "<init>",
-                            "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V",
-                            &semanticTagStructStructCtor_3);
-                        if (err != CHIP_NO_ERROR || semanticTagStructStructCtor_3 == nullptr)
+                        jmethodID ambientContextTypeStructStructCtor_2;
+                        err = chip::JniReferences::GetInstance().FindMethod(env, ambientContextTypeStructStructClass_2, "<init>",
+                                                                            "(Ljava/util/ArrayList;Ljava/util/Optional;)V",
+                                                                            &ambientContextTypeStructStructCtor_2);
+                        if (err != CHIP_NO_ERROR || ambientContextTypeStructStructCtor_2 == nullptr)
                         {
-                            ChipLogError(Zcl,
-                                         "Could not find ChipStructs$AmbientContextSensingClusterSemanticTagStruct constructor");
+                            ChipLogError(
+                                Zcl, "Could not find ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct constructor");
                             return nullptr;
                         }
 
-                        newElement_2 =
-                            env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, newElement_2_mfgCode,
-                                           newElement_2_namespaceID, newElement_2_tag, newElement_2_label);
+                        newElement_1 = env->NewObject(ambientContextTypeStructStructClass_2, ambientContextTypeStructStructCtor_2,
+                                                      newElement_1_ambientContextSensed, newElement_1_detectionStartTime);
                     }
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(newElement_0_ambientContextSensed,
-                                                                                          newElement_2);
-                }
-                jobject newElement_0_detectionStartTime;
-                if (!entry_0.detectionStartTime.HasValue())
-                {
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr,
-                                                                                               newElement_0_detectionStartTime);
-                }
-                else
-                {
-                    jobject newElement_0_detectionStartTimeInsideOptional;
-                    std::string newElement_0_detectionStartTimeInsideOptionalClassName     = "java/lang/Long";
-                    std::string newElement_0_detectionStartTimeInsideOptionalCtorSignature = "(J)V";
-                    jlong jninewElement_0_detectionStartTimeInsideOptional = static_cast<jlong>(entry_0.detectionStartTime.Value());
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
-                        newElement_0_detectionStartTimeInsideOptionalClassName.c_str(),
-                        newElement_0_detectionStartTimeInsideOptionalCtorSignature.c_str(),
-                        jninewElement_0_detectionStartTimeInsideOptional, newElement_0_detectionStartTimeInsideOptional);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_detectionStartTimeInsideOptional, newElement_0_detectionStartTime);
-                }
-                jobject newElement_0_objectCountThreshold;
-                if (!entry_0.objectCountThreshold.HasValue())
-                {
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr,
-                                                                                               newElement_0_objectCountThreshold);
-                }
-                else
-                {
-                    jobject newElement_0_objectCountThresholdInsideOptional;
-                    std::string newElement_0_objectCountThresholdInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_objectCountThresholdInsideOptionalCtorSignature = "(I)V";
-                    jint jninewElement_0_objectCountThresholdInsideOptional =
-                        static_cast<jint>(entry_0.objectCountThreshold.Value());
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_0_objectCountThresholdInsideOptionalClassName.c_str(),
-                        newElement_0_objectCountThresholdInsideOptionalCtorSignature.c_str(),
-                        jninewElement_0_objectCountThresholdInsideOptional, newElement_0_objectCountThresholdInsideOptional);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_objectCountThresholdInsideOptional, newElement_0_objectCountThreshold);
-                }
-                jobject newElement_0_objectCount;
-                if (!entry_0.objectCount.HasValue())
-                {
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_objectCount);
-                }
-                else
-                {
-                    jobject newElement_0_objectCountInsideOptional;
-                    std::string newElement_0_objectCountInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_objectCountInsideOptionalCtorSignature = "(I)V";
-                    jint jninewElement_0_objectCountInsideOptional = static_cast<jint>(entry_0.objectCount.Value());
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
-                        newElement_0_objectCountInsideOptionalClassName.c_str(),
-                        newElement_0_objectCountInsideOptionalCtorSignature.c_str(), jninewElement_0_objectCountInsideOptional,
-                        newElement_0_objectCountInsideOptional);
-                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_objectCountInsideOptional, newElement_0_objectCount);
+                    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(value_ambientContextTypeInsideOptional,
+                                                                                          newElement_1);
                 }
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(value_ambientContextTypeInsideOptional,
+                                                                                           value_ambientContextType);
+            }
 
-                {
-                    jclass ambientContextTypeStructStructClass_1;
-                    err = chip::JniReferences::GetInstance().GetLocalClassRef(
-                        env, "chip/devicecontroller/ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct",
-                        ambientContextTypeStructStructClass_1);
-                    if (err != CHIP_NO_ERROR)
-                    {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct");
-                        return nullptr;
-                    }
+            jobject value_objectCount;
+            if (!cppValue.objectCount.HasValue())
+            {
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, value_objectCount);
+            }
+            else
+            {
+                jobject value_objectCountInsideOptional;
+                std::string value_objectCountInsideOptionalClassName     = "java/lang/Integer";
+                std::string value_objectCountInsideOptionalCtorSignature = "(I)V";
+                jint jnivalue_objectCountInsideOptional                  = static_cast<jint>(cppValue.objectCount.Value());
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+                    value_objectCountInsideOptionalClassName.c_str(), value_objectCountInsideOptionalCtorSignature.c_str(),
+                    jnivalue_objectCountInsideOptional, value_objectCountInsideOptional);
+                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(value_objectCountInsideOptional,
+                                                                                           value_objectCount);
+            }
 
-                    jmethodID ambientContextTypeStructStructCtor_1;
-                    err = chip::JniReferences::GetInstance().FindMethod(
-                        env, ambientContextTypeStructStructClass_1, "<init>",
-                        "(Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
-                        &ambientContextTypeStructStructCtor_1);
-                    if (err != CHIP_NO_ERROR || ambientContextTypeStructStructCtor_1 == nullptr)
-                    {
-                        ChipLogError(Zcl,
-                                     "Could not find ChipStructs$AmbientContextSensingClusterAmbientContextTypeStruct constructor");
-                        return nullptr;
-                    }
+            jclass ambientContextDetectStartedStructClass;
+            err = chip::JniReferences::GetInstance().GetLocalClassRef(
+                env, "chip/devicecontroller/ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectStartedEvent",
+                ambientContextDetectStartedStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl,
+                             "Could not find class ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectStartedEvent");
+                return nullptr;
+            }
 
-                    newElement_0 = env->NewObject(ambientContextTypeStructStructClass_1, ambientContextTypeStructStructCtor_1,
-                                                  newElement_0_ambientContextSensed, newElement_0_detectionStartTime,
-                                                  newElement_0_objectCountThreshold, newElement_0_objectCount);
-                }
-                TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(value_ambientContextType, newElement_0);
+            jmethodID ambientContextDetectStartedStructCtor;
+            err = chip::JniReferences::GetInstance().FindMethod(env, ambientContextDetectStartedStructClass, "<init>",
+                                                                "(Ljava/util/Optional;Ljava/util/Optional;)V",
+                                                                &ambientContextDetectStartedStructCtor);
+            if (err != CHIP_NO_ERROR || ambientContextDetectStartedStructCtor == nullptr)
+            {
+                ChipLogError(
+                    Zcl,
+                    "Could not find ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectStartedEvent constructor");
+                return nullptr;
             }
 
-            jclass ambientContextDetectedStructClass;
+            jobject value = env->NewObject(ambientContextDetectStartedStructClass, ambientContextDetectStartedStructCtor,
+                                           value_ambientContextType, value_objectCount);
+
+            return value;
+        }
+        case Events::AmbientContextDetectEnded::Id: {
+            Events::AmbientContextDetectEnded::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value_startEventNumber;
+            std::string value_startEventNumberClassName     = "java/lang/Long";
+            std::string value_startEventNumberCtorSignature = "(J)V";
+            jlong jnivalue_startEventNumber                 = static_cast<jlong>(cppValue.startEventNumber);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                value_startEventNumberClassName.c_str(), value_startEventNumberCtorSignature.c_str(), jnivalue_startEventNumber,
+                value_startEventNumber);
+
+            jclass ambientContextDetectEndedStructClass;
             err = chip::JniReferences::GetInstance().GetLocalClassRef(
-                env, "chip/devicecontroller/ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectedEvent",
-                ambientContextDetectedStructClass);
+                env, "chip/devicecontroller/ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectEndedEvent",
+                ambientContextDetectEndedStructClass);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectedEvent");
+                ChipLogError(Zcl,
+                             "Could not find class ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectEndedEvent");
                 return nullptr;
             }
 
-            jmethodID ambientContextDetectedStructCtor;
-            err = chip::JniReferences::GetInstance().FindMethod(env, ambientContextDetectedStructClass, "<init>",
-                                                                "(Ljava/util/ArrayList;)V", &ambientContextDetectedStructCtor);
-            if (err != CHIP_NO_ERROR || ambientContextDetectedStructCtor == nullptr)
+            jmethodID ambientContextDetectEndedStructCtor;
+            err = chip::JniReferences::GetInstance().FindMethod(env, ambientContextDetectEndedStructClass, "<init>",
+                                                                "(Ljava/lang/Long;)V", &ambientContextDetectEndedStructCtor);
+            if (err != CHIP_NO_ERROR || ambientContextDetectEndedStructCtor == nullptr)
             {
-                ChipLogError(Zcl,
-                             "Could not find ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectedEvent constructor");
+                ChipLogError(
+                    Zcl, "Could not find ChipEventStructs$AmbientContextSensingClusterAmbientContextDetectEndedEvent constructor");
                 return nullptr;
             }
 
             jobject value =
-                env->NewObject(ambientContextDetectedStructClass, ambientContextDetectedStructCtor, value_ambientContextType);
+                env->NewObject(ambientContextDetectEndedStructClass, ambientContextDetectEndedStructCtor, value_startEventNumber);
 
             return value;
         }
diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
index efce6b260f7..cbadff384f7 100644
--- a/src/controller/python/BUILD.gn
+++ b/src/controller/python/BUILD.gn
@@ -105,8 +105,8 @@ shared_library("ChipDeviceCtrl") {
       ]
     }
     defines += [ "CHIP_CONFIG_MAX_ACTIVE_TCP_CONNECTIONS=20" ]
-    defines += [ "CHIP_CONFIG_MAX_GROUPS_PER_FABRIC=50" ]
     defines += [ "CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC=50" ]
+    defines += [ "CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT=100" ]
 
     if (chip_python_supports_stack_locking) {
       sources += [ "matter/native/ChipMainLoopWork_StackLock.cpp" ]
diff --git a/src/controller/python/ChipDeviceController-ScriptBinding.cpp b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
index 711351cc361..b19d0e36f19 100644
--- a/src/controller/python/ChipDeviceController-ScriptBinding.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
@@ -185,6 +185,10 @@ PyChipError pychip_DeviceController_OnNetworkCommission(chip::Controller::Device
                                                         chip::Controller::ScriptDevicePairingDelegate * pairingDelegate,
                                                         uint64_t nodeId, uint32_t setupPasscode, const uint8_t filterType,
                                                         const char * filterParam, uint32_t discoveryTimeoutMsec);
+PyChipError pychip_DeviceController_ThreadMeshcopCommission(chip::Controller::DeviceCommissioner * devCtrl,
+                                                            chip::Controller::ScriptDevicePairingDelegate * pairingDelegate,
+                                                            uint64_t nodeId, uint32_t setupPasscode, uint16_t discriminator,
+                                                            const char * borderAgentIPAddr, uint16_t borderAgentPort);
 
 PyChipError pychip_DeviceController_PostTaskOnChipThread(ChipThreadTaskRunnerFunct callback, void * pythonContext);
 
@@ -576,6 +580,29 @@ PyChipError pychip_DeviceController_OnNetworkCommission(chip::Controller::Device
     return ToPyChipError(devCtrl->DiscoverCommissionableNodes(filter));
 }
 
+PyChipError pychip_DeviceController_ThreadMeshcopCommission(chip::Controller::DeviceCommissioner * devCtrl,
+                                                            chip::Controller::ScriptDevicePairingDelegate * pairingDelegate,
+                                                            uint64_t nodeId, uint32_t setupPasscode, uint16_t discriminator,
+                                                            const char * borderAgentIPAddrStr, uint16_t borderAgentPort)
+{
+#if CHIP_SUPPORT_THREAD_MESHCOP
+    const uint32_t kDefaultDiscoveryTimeoutMsec = 1000000;
+    CHIP_ERROR err = sPairingDeviceDiscoveryDelegate.Init(nodeId, setupPasscode, sCommissioningParameters, pairingDelegate, devCtrl,
+                                                          kDefaultDiscoveryTimeoutMsec);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, ToPyChipError(err));
+    chip::Transport::PeerAddress address(Transport::Type::kThreadMeshcop);
+    chip::Inet::IPAddress borderAgentIPAddr;
+    VerifyOrReturnError(chip::Inet::IPAddress::FromString(borderAgentIPAddrStr, borderAgentIPAddr),
+                        ToPyChipError(CHIP_ERROR_INVALID_ARGUMENT));
+    address.SetIPAddress(borderAgentIPAddr).SetPort(borderAgentPort);
+
+    auto params = RendezvousParameters().SetSetupPINCode(setupPasscode).SetDiscriminator(discriminator).SetPeerAddress(address);
+    return ToPyChipError(devCtrl->PairDevice(nodeId, params, sCommissioningParameters));
+#else
+    return ToPyChipError(CHIP_ERROR_NOT_IMPLEMENTED);
+#endif // CHIP_SUPPORT_THREAD_MESHCOP
+}
+
 PyChipError pychip_DeviceController_SetThreadOperationalDataset(const char * threadOperationalDataset, uint32_t size)
 {
     VerifyOrReturnError(sThreadBuf.Alloc(size), ToPyChipError(CHIP_ERROR_NO_MEMORY));
diff --git a/src/controller/python/matter/ChipDeviceCtrl.py b/src/controller/python/matter/ChipDeviceCtrl.py
index ed1a6331d9f..eee1e9591e6 100644
--- a/src/controller/python/matter/ChipDeviceCtrl.py
+++ b/src/controller/python/matter/ChipDeviceCtrl.py
@@ -2543,6 +2543,15 @@ def _InitLib(self):
                 c_void_p, c_void_p, c_uint64, c_uint32, c_uint8, c_char_p, c_uint32]
             self._dmLib.pychip_DeviceController_OnNetworkCommission.restype = PyChipError
 
+            if hasattr(self._dmLib, "pychip_DeviceController_ThreadMeshcopCommission"):
+                self._dmLib.pychip_DeviceController_ThreadMeshcopCommission.argtypes = [
+                    c_void_p, c_void_p, c_uint64, c_uint32, c_uint16, c_char_p, c_uint16]
+                self._dmLib.pychip_DeviceController_ThreadMeshcopCommission.restype = PyChipError
+            else:
+                logging.getLogger(__name__).warning(
+                    "pychip_DeviceController_ThreadMeshcopCommission is not available in the loaded CHIP library; "
+                    "Thread Meshcop commissioning is disabled.")
+
             self._dmLib.pychip_DeviceController_DiscoverCommissionableNodes.argtypes = [
                 c_void_p, c_uint8, c_char_p]
             self._dmLib.pychip_DeviceController_DiscoverCommissionableNodes.restype = PyChipError
@@ -3182,6 +3191,33 @@ async def CommissionOnNetwork(self, nodeId: int, setupPinCode: int,
 
             return await asyncio.futures.wrap_future(ctx.future)
 
+    async def CommissionThreadMeshcop(self, nodeId: int, setupPinCode: int,
+                                      discriminator: int, borderAgentIPAddr: str,
+                                      borderAgentPort: int, threadOperationalDataset: bytes) -> int:
+        '''
+        Commission with the given node ID from the setupPinCode and discriminator
+        over Thread MeshCoP transport
+
+        Args:
+            nodeId (int): The node ID of the device.
+            setupPinCode (int): The setup pin code of the device.
+            discriminator (int): The long discriminator for the DNS-SD advertisement. Valid range: 0-4095.
+            borderAgentIPAddr (str): IP address of Border Agent in Thread network
+            borderAgentPort (int): The port of Border Agent in Thread network
+            threadOperationalDataset (bytes): The operational dataset of Thread network
+        '''
+        self.CheckIsActive()
+
+        self.SetThreadOperationalDataset(threadOperationalDataset)
+        async with self._commissioning_context as ctx:
+            self._enablePairingCompleteCallback(True)
+            await self._ChipStack.CallAsync(
+                lambda: self._dmLib.pychip_DeviceController_ThreadMeshcopCommission(
+                    self.devCtrl, self.pairingDelegate, nodeId, setupPinCode, discriminator, borderAgentIPAddr.encode("utf-8"), borderAgentPort)
+            )
+
+            return await asyncio.futures.wrap_future(ctx.future)
+
     def get_rcac(self):
         '''
         Passes captured RCAC data back to Python test modules for validation
diff --git a/src/controller/python/matter/clusters/CHIPClusters.py b/src/controller/python/matter/clusters/CHIPClusters.py
index bec417eb387..99d7e0635c2 100644
--- a/src/controller/python/matter/clusters/CHIPClusters.py
+++ b/src/controller/python/matter/clusters/CHIPClusters.py
@@ -3544,6 +3544,13 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
+            0x00000004: {
+                "attributeName": "GroupcastAdoption",
+                "attributeId": 0x00000004,
+                "type": "",
+                "reportable": True,
+                "writable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -4929,6 +4936,12 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
+            0x0000000D: {
+                "attributeName": "Unmounted",
+                "attributeId": 0x0000000D,
+                "type": "bool",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -11488,34 +11501,47 @@ class ChipClusters:
                 "reportable": True,
             },
             0x00000005: {
-                "attributeName": "SimultaneousDetectionLimit",
+                "attributeName": "ObjectCountReached",
                 "attributeId": 0x00000005,
-                "type": "int",
+                "type": "bool",
                 "reportable": True,
-                "writable": True,
             },
             0x00000006: {
-                "attributeName": "ObjectCountReached",
+                "attributeName": "ObjectCountConfig",
                 "attributeId": 0x00000006,
-                "type": "bool",
+                "type": "",
                 "reportable": True,
+                "writable": True,
             },
             0x00000007: {
-                "attributeName": "HoldTime",
+                "attributeName": "ObjectCount",
                 "attributeId": 0x00000007,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x00000008: {
-                "attributeName": "HoldTimeLimits",
+                "attributeName": "SimultaneousDetectionLimit",
                 "attributeId": 0x00000008,
-                "type": "",
+                "type": "int",
                 "reportable": True,
+                "writable": True,
             },
             0x00000009: {
-                "attributeName": "PredictedActivity",
+                "attributeName": "HoldTime",
                 "attributeId": 0x00000009,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x0000000A: {
+                "attributeName": "HoldTimeLimits",
+                "attributeId": 0x0000000A,
+                "type": "",
+                "reportable": True,
+            },
+            0x0000000B: {
+                "attributeName": "PredictedActivity",
+                "attributeId": 0x0000000B,
                 "type": "",
                 "reportable": True,
             },
diff --git a/src/controller/python/matter/clusters/Objects.py b/src/controller/python/matter/clusters/Objects.py
index 0c1a640b804..4c76041ae98 100644
--- a/src/controller/python/matter/clusters/Objects.py
+++ b/src/controller/python/matter/clusters/Objects.py
@@ -8055,7 +8055,6 @@ class RadioFaultEnum(MatterIntEnum):
     class Bitmaps:
         class Feature(IntFlag):
             kDataModelTest = 0x1
-            kDeviceLoad = 0x2
 
     class Structs:
         @dataclass
@@ -13357,6 +13356,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="groupTable", Tag=0x00000001, Type=typing.List[GroupKeyManagement.Structs.GroupInfoMapStruct]),
                 ClusterObjectFieldDescriptor(Label="maxGroupsPerFabric", Tag=0x00000002, Type=uint),
                 ClusterObjectFieldDescriptor(Label="maxGroupKeysPerFabric", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="groupcastAdoption", Tag=0x00000004, Type=typing.Optional[typing.List[GroupKeyManagement.Structs.GroupcastAdoptionStruct]]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
@@ -13368,6 +13368,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     groupTable: typing.List[GroupKeyManagement.Structs.GroupInfoMapStruct] = field(default_factory=lambda: [])
     maxGroupsPerFabric: uint = 0
     maxGroupKeysPerFabric: uint = 0
+    groupcastAdoption: typing.Optional[typing.List[GroupKeyManagement.Structs.GroupcastAdoptionStruct]] = None
     generatedCommandList: typing.List[uint] = field(default_factory=lambda: [])
     acceptedCommandList: typing.List[uint] = field(default_factory=lambda: [])
     attributeList: typing.List[uint] = field(default_factory=lambda: [])
@@ -13375,6 +13376,15 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: uint = 0
 
     class Enums:
+        class GroupKeyMulticastPolicyEnum(MatterIntEnum):
+            kPerGroupID = 0x00
+            kAllNodes = 0x01
+            # All received enum values that are not listed above will be mapped
+            # to kUnknownEnumValue. This is a helper enum value that should only
+            # be used by code to process how it handles receiving an unknown
+            # enum value. This specific value should never be transmitted.
+            kUnknownEnumValue = 2
+
         class GroupKeySecurityPolicyEnum(MatterIntEnum):
             kTrustFirst = 0x00
             kCacheAndSync = 0x01
@@ -13387,6 +13397,7 @@ class GroupKeySecurityPolicyEnum(MatterIntEnum):
     class Bitmaps:
         class Feature(IntFlag):
             kCacheAndSync = 0x1
+            kGroupcast = 0x2
 
     class Structs:
         @dataclass
@@ -13435,6 +13446,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(Label="epochStartTime1", Tag=5, Type=typing.Union[Nullable, uint]),
                         ClusterObjectFieldDescriptor(Label="epochKey2", Tag=6, Type=typing.Union[Nullable, bytes]),
                         ClusterObjectFieldDescriptor(Label="epochStartTime2", Tag=7, Type=typing.Union[Nullable, uint]),
+                        ClusterObjectFieldDescriptor(Label="groupKeyMulticastPolicy", Tag=8, Type=GroupKeyManagement.Enums.GroupKeyMulticastPolicyEnum),
                     ])
 
             groupKeySetID: 'uint' = 0
@@ -13445,6 +13457,20 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             epochStartTime1: 'typing.Union[Nullable, uint]' = NullValue
             epochKey2: 'typing.Union[Nullable, bytes]' = NullValue
             epochStartTime2: 'typing.Union[Nullable, uint]' = NullValue
+            groupKeyMulticastPolicy: 'GroupKeyManagement.Enums.GroupKeyMulticastPolicyEnum' = 0
+
+        @dataclass
+        class GroupcastAdoptionStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="groupcastAdopted", Tag=0, Type=bool),
+                        ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
+                    ])
+
+            groupcastAdopted: 'bool' = False
+            fabricIndex: 'uint' = 0
 
     class Commands:
         @dataclass
@@ -13605,6 +13631,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: uint = 0
 
+        @dataclass
+        class GroupcastAdoption(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000003F
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GroupKeyManagement.Structs.GroupcastAdoptionStruct]])
+
+            value: typing.Optional[typing.List[GroupKeyManagement.Structs.GroupcastAdoptionStruct]] = None
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -18008,6 +18050,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="contaminationState", Tag=0x0000000A, Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]),
                 ClusterObjectFieldDescriptor(Label="smokeSensitivityLevel", Tag=0x0000000B, Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]),
                 ClusterObjectFieldDescriptor(Label="expiryDate", Tag=0x0000000C, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="unmounted", Tag=0x0000000D, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
@@ -18028,6 +18071,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     contaminationState: typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum] = None
     smokeSensitivityLevel: typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum] = None
     expiryDate: typing.Optional[uint] = None
+    unmounted: typing.Optional[bool] = None
     generatedCommandList: typing.List[uint] = field(default_factory=lambda: [])
     acceptedCommandList: typing.List[uint] = field(default_factory=lambda: [])
     attributeList: typing.List[uint] = field(default_factory=lambda: [])
@@ -18075,11 +18119,12 @@ class ExpressedStateEnum(MatterIntEnum):
             kEndOfService = 0x06
             kInterconnectSmoke = 0x07
             kInterconnectCO = 0x08
+            kInoperative = 0x09
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving an unknown
             # enum value. This specific value should never be transmitted.
-            kUnknownEnumValue = 9
+            kUnknownEnumValue = 10
 
         class MuteStateEnum(MatterIntEnum):
             kNotMuted = 0x00
@@ -18328,6 +18373,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: typing.Optional[uint] = None
 
+        @dataclass
+        class Unmounted(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0000005C
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000D
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+
+            value: typing.Optional[bool] = None
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -42046,11 +42107,13 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="audioContextDetected", Tag=0x00000002, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="ambientContextType", Tag=0x00000003, Type=typing.Optional[typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct]]),
                 ClusterObjectFieldDescriptor(Label="ambientContextTypeSupported", Tag=0x00000004, Type=typing.Optional[typing.List[Globals.Structs.SemanticTagStruct]]),
-                ClusterObjectFieldDescriptor(Label="simultaneousDetectionLimit", Tag=0x00000005, Type=uint),
-                ClusterObjectFieldDescriptor(Label="objectCountReached", Tag=0x00000006, Type=typing.Optional[bool]),
-                ClusterObjectFieldDescriptor(Label="holdTime", Tag=0x00000007, Type=uint),
-                ClusterObjectFieldDescriptor(Label="holdTimeLimits", Tag=0x00000008, Type=AmbientContextSensing.Structs.HoldTimeLimitsStruct),
-                ClusterObjectFieldDescriptor(Label="predictedActivity", Tag=0x00000009, Type=typing.Optional[typing.List[AmbientContextSensing.Structs.PredictedActivityStruct]]),
+                ClusterObjectFieldDescriptor(Label="objectCountReached", Tag=0x00000005, Type=typing.Optional[bool]),
+                ClusterObjectFieldDescriptor(Label="objectCountConfig", Tag=0x00000006, Type=typing.Optional[AmbientContextSensing.Structs.ObjectCountConfigStruct]),
+                ClusterObjectFieldDescriptor(Label="objectCount", Tag=0x00000007, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="simultaneousDetectionLimit", Tag=0x00000008, Type=uint),
+                ClusterObjectFieldDescriptor(Label="holdTime", Tag=0x00000009, Type=uint),
+                ClusterObjectFieldDescriptor(Label="holdTimeLimits", Tag=0x0000000A, Type=AmbientContextSensing.Structs.HoldTimeLimitsStruct),
+                ClusterObjectFieldDescriptor(Label="predictedActivity", Tag=0x0000000B, Type=typing.Optional[typing.List[AmbientContextSensing.Structs.PredictedActivityStruct]]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
@@ -42063,8 +42126,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     audioContextDetected: typing.Optional[bool] = None
     ambientContextType: typing.Optional[typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct]] = None
     ambientContextTypeSupported: typing.Optional[typing.List[Globals.Structs.SemanticTagStruct]] = None
-    simultaneousDetectionLimit: uint = 0
     objectCountReached: typing.Optional[bool] = None
+    objectCountConfig: typing.Optional[AmbientContextSensing.Structs.ObjectCountConfigStruct] = None
+    objectCount: typing.Optional[uint] = None
+    simultaneousDetectionLimit: uint = 0
     holdTime: uint = 0
     holdTimeLimits: AmbientContextSensing.Structs.HoldTimeLimitsStruct = field(default_factory=lambda: AmbientContextSensing.Structs.HoldTimeLimitsStruct())
     predictedActivity: typing.Optional[typing.List[AmbientContextSensing.Structs.PredictedActivityStruct]] = None
@@ -42091,14 +42156,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields=[
                         ClusterObjectFieldDescriptor(Label="ambientContextSensed", Tag=0, Type=typing.List[Globals.Structs.SemanticTagStruct]),
                         ClusterObjectFieldDescriptor(Label="detectionStartTime", Tag=1, Type=typing.Optional[uint]),
-                        ClusterObjectFieldDescriptor(Label="objectCountThreshold", Tag=2, Type=typing.Optional[uint]),
-                        ClusterObjectFieldDescriptor(Label="objectCount", Tag=3, Type=typing.Optional[uint]),
                     ])
 
             ambientContextSensed: 'typing.List[Globals.Structs.SemanticTagStruct]' = field(default_factory=lambda: [])
             detectionStartTime: 'typing.Optional[uint]' = None
-            objectCountThreshold: 'typing.Optional[uint]' = None
-            objectCount: 'typing.Optional[uint]' = None
 
         @dataclass
         class HoldTimeLimitsStruct(ClusterObject):
@@ -42115,6 +42176,19 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             holdTimeMax: 'uint' = 0
             holdTimeDefault: 'uint' = 0
 
+        @dataclass
+        class ObjectCountConfigStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="countingObject", Tag=0, Type=Globals.Structs.SemanticTagStruct),
+                        ClusterObjectFieldDescriptor(Label="objectCountThreshold", Tag=1, Type=uint),
+                    ])
+
+            countingObject: 'Globals.Structs.SemanticTagStruct' = field(default_factory=lambda: Globals.Structs.SemanticTagStruct())
+            objectCountThreshold: 'uint' = 0
+
         @dataclass
         class PredictedActivityStruct(ClusterObject):
             @ChipUtility.classproperty
@@ -42218,7 +42292,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: typing.Optional[typing.List[Globals.Structs.SemanticTagStruct]] = None
 
         @dataclass
-        class SimultaneousDetectionLimit(ClusterAttributeDescriptor):
+        class ObjectCountReached(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000431
@@ -42229,12 +42303,12 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
 
-            value: uint = 0
+            value: typing.Optional[bool] = None
 
         @dataclass
-        class ObjectCountReached(ClusterAttributeDescriptor):
+        class ObjectCountConfig(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000431
@@ -42245,12 +42319,12 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[AmbientContextSensing.Structs.ObjectCountConfigStruct])
 
-            value: typing.Optional[bool] = None
+            value: typing.Optional[AmbientContextSensing.Structs.ObjectCountConfigStruct] = None
 
         @dataclass
-        class HoldTime(ClusterAttributeDescriptor):
+        class ObjectCount(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000431
@@ -42259,6 +42333,38 @@ def cluster_id(cls) -> int:
             def attribute_id(cls) -> int:
                 return 0x00000007
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: typing.Optional[uint] = None
+
+        @dataclass
+        class SimultaneousDetectionLimit(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000431
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: uint = 0
+
+        @dataclass
+        class HoldTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000431
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000009
+
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
@@ -42273,7 +42379,7 @@ def cluster_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000008
+                return 0x0000000A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -42289,7 +42395,7 @@ def cluster_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000009
+                return 0x0000000B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -42379,7 +42485,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class AmbientContextDetected(ClusterEvent):
+        class AmbientContextDetectStarted(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000431
@@ -42392,10 +42498,31 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="ambientContextType", Tag=0, Type=typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct]),
+                        ClusterObjectFieldDescriptor(Label="ambientContextType", Tag=0, Type=typing.Optional[typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct]]),
+                        ClusterObjectFieldDescriptor(Label="objectCount", Tag=1, Type=typing.Optional[uint]),
+                    ])
+
+            ambientContextType: typing.Optional[typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct]] = None
+            objectCount: typing.Optional[uint] = None
+
+        @dataclass
+        class AmbientContextDetectEnded(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000431
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="startEventNumber", Tag=0, Type=uint),
                     ])
 
-            ambientContextType: typing.List[AmbientContextSensing.Structs.AmbientContextTypeStruct] = field(default_factory=lambda: [])
+            startEventNumber: uint = 0
 
 
 @dataclass
diff --git a/src/controller/python/matter/server/ServerInit.cpp b/src/controller/python/matter/server/ServerInit.cpp
index 005ab1c8176..9c51d3a980d 100644
--- a/src/controller/python/matter/server/ServerInit.cpp
+++ b/src/controller/python/matter/server/ServerInit.cpp
@@ -168,11 +168,12 @@ PyChipError pychip_server_native_init()
     initParams.operationalServicePort        = CHIP_PORT;
     initParams.userDirectedCommissioningPort = CHIP_UDC_PORT;
 
-    PyReturnErrorOnFailure(ToPyChipError(chip::Server::GetInstance().Init(initParams)));
-
-    // Initialize device attestation config
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());
 
+    PyReturnErrorOnFailure(ToPyChipError(chip::Server::GetInstance().Init(initParams)));
+
     PyReturnErrorOnFailure(ToPyChipError(chip::DeviceLayer::PlatformMgr().StartEventLoopTask()));
 
     atexit(CleanShutdown);
diff --git a/src/controller/tests/BUILD.gn b/src/controller/tests/BUILD.gn
index 5da2695fba4..4631a376096 100644
--- a/src/controller/tests/BUILD.gn
+++ b/src/controller/tests/BUILD.gn
@@ -68,7 +68,6 @@ chip_test_suite("tests") {
 
   public_deps = [
     "${chip_root}/src/app/common:cluster-objects",
-    "${chip_root}/src/app/server",
     "${chip_root}/src/app/tests:helpers",
     "${chip_root}/src/controller",
     "${chip_root}/src/controller/data_model",
@@ -78,11 +77,4 @@ chip_test_suite("tests") {
     "${chip_root}/src/messaging/tests:helpers",
     "${chip_root}/src/transport/raw/tests:helpers",
   ]
-
-  if (chip_device_config_enable_joint_fabric) {
-    public_deps += [
-      "${chip_root}/src/controller/data_model",
-      "${chip_root}/src/controller/jcm",
-    ]
-  }
 }
diff --git a/src/credentials/GroupDataProvider.h b/src/credentials/GroupDataProvider.h
index d7e4ccef8b8..18b19afea60 100644
--- a/src/credentials/GroupDataProvider.h
+++ b/src/credentials/GroupDataProvider.h
@@ -35,6 +35,7 @@ class GroupDataProvider
 public:
     using SecurityPolicy                                  = app::Clusters::GroupKeyManagement::GroupKeySecurityPolicyEnum;
     static constexpr KeysetId kIdentityProtectionKeySetId = 0;
+    static constexpr size_t kMaxListeners                 = 2;
 
     struct GroupInfo
     {
@@ -44,23 +45,24 @@ class GroupDataProvider
             kHasAuxiliaryACL = 0b00000001,
             kMcastAddrPolicy = 0b00000010,
         };
+        static constexpr uint8_t kFlagsDefault = to_underlying(GroupInfo::Flags::kMcastAddrPolicy);
 
         // Identifies group within the scope of the given Fabric
         GroupId group_id = kUndefinedGroupId;
         // Lastest group name written for a given GroupId on any Endpoint via the Groups cluster
         char name[kGroupNameMax + 1] = { 0 };
-        uint8_t flags                = 0;
+        uint8_t flags                = kFlagsDefault;
         uint16_t count               = 0;
 
         GroupInfo() { SetName(nullptr); }
         GroupInfo(const GroupInfo & other) { Copy(other); }
         GroupInfo(const char * groupName) { SetName(groupName); }
         GroupInfo(const CharSpan & groupName) { SetName(groupName); }
-        GroupInfo(GroupId id, const char * groupName, uint8_t groupFlags = 0) : group_id(id), flags(groupFlags)
+        GroupInfo(GroupId id, const char * groupName, uint8_t groupFlags = kFlagsDefault) : group_id(id), flags(groupFlags)
         {
             SetName(groupName);
         }
-        GroupInfo(GroupId id, const CharSpan & groupName, uint8_t groupFlags = 0) : group_id(id), flags(groupFlags)
+        GroupInfo(GroupId id, const CharSpan & groupName, uint8_t groupFlags = kFlagsDefault) : group_id(id), flags(groupFlags)
         {
             SetName(groupName);
         }
@@ -95,6 +97,9 @@ class GroupDataProvider
                 SetName(other.name);
             }
         }
+        bool HasAuxiliaryACL() const { return (flags & static_cast<uint8_t>(Flags::kHasAuxiliaryACL)); }
+        bool UsePerGroupAddress() const { return (flags & static_cast<uint8_t>(Flags::kMcastAddrPolicy)); }
+
         bool operator==(const GroupInfo & other) const
         {
             return (this->group_id == other.group_id) && !strncmp(this->name, other.name, kGroupNameMax);
@@ -213,6 +218,19 @@ class GroupDataProvider
          *  @param[in] old_group  GroupInfo structure of the removed group.
          */
         virtual void OnGroupRemoved(FabricIndex fabric_index, const GroupInfo & old_group) = 0;
+        /**
+         *  Callback invoked when an existing group is modified.
+         *  The modifications may be any of the following:
+         *  - Endpoints List modified
+         *  - KeySetID modified
+         *  - Flags modified (kHasAuxiliaryACL or kMcastAddrPolicy)
+         *
+         * Note that this callback is not invoked when the group is added or removed.
+         * Those events are handled by the OnGroupAdded and OnGroupRemoved callbacks respectively.
+         *
+         *  @param[in] modified_group_id  ID of the modified group.
+         */
+        virtual void OnGroupModified(FabricIndex fabric_index, const GroupId & modified_group_id){};
     };
 
     using GroupInfoIterator    = CommonIterator<GroupInfo>;
@@ -221,12 +239,16 @@ class GroupDataProvider
     using KeySetIterator       = CommonIterator<KeySet>;
     using GroupSessionIterator = CommonIterator<GroupSession>;
 
-    GroupDataProvider(uint16_t maxGroupsPerFabric    = CHIP_CONFIG_MAX_GROUPS_PER_FABRIC,
-                      uint16_t maxGroupKeysPerFabric = CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC) :
-        mMaxGroupsPerFabric(maxGroupsPerFabric),
-        mMaxGroupKeysPerFabric(maxGroupKeysPerFabric)
+    GroupDataProvider(uint16_t maxGroupsPerFabric, uint16_t maxGroupKeysPerFabric) :
+        mMaxGroupsPerFabric(maxGroupsPerFabric), mMaxGroupKeysPerFabric(maxGroupKeysPerFabric)
     {}
 
+    enum class GroupCleanupPolicy
+    {
+        kDeleteGroupIfEmpty, // Default behavior for legacy Groups
+        kKeepGroupIfEmpty    // Required for Groupcast Sender feature
+    };
+
     virtual ~GroupDataProvider() = default;
 
     // Not copyable
@@ -262,6 +284,10 @@ class GroupDataProvider
     // Endpoints
     virtual bool HasEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id)          = 0;
     virtual CHIP_ERROR AddEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id)    = 0;
+    virtual CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id,
+                                      GroupCleanupPolicy cleanupPolicy)                                   = 0;
+    virtual CHIP_ERROR RemoveEndpointAllGroups(FabricIndex fabric_index, EndpointId endpoint_id,
+                                               GroupCleanupPolicy cleanupPolicy)                          = 0;
     virtual CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id) = 0;
     virtual CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, EndpointId endpoint_id)                   = 0;
     virtual CHIP_ERROR RemoveEndpoints(FabricIndex fabric_index, GroupId group_id)                        = 0;
@@ -344,30 +370,67 @@ class GroupDataProvider
     virtual Crypto::SymmetricKeyContext * GetKeyContext(FabricIndex fabric_index, GroupId group_id) = 0;
 
     // Listener
-    void SetListener(GroupListener * listener) { mListener = listener; };
-    void RemoveListener() { mListener = nullptr; };
+    void SetListener(GroupListener * listener)
+    {
+        for (size_t i = 0; listener && (i < kMaxListeners); ++i)
+        {
+            if (nullptr == mListeners[i])
+            {
+                mListeners[i] = listener;
+                return;
+            }
+        }
+    }
+    void RemoveListener(GroupListener * listener)
+    {
+        for (size_t i = 0; listener && (i < kMaxListeners); ++i)
+        {
+            if (listener == mListeners[i])
+            {
+                mListeners[i] = nullptr;
+                return;
+            }
+        }
+    }
 
-    // Groupcast MaxMembershipCount
+    // Groupcast
     virtual uint16_t getMaxMembershipCount() = 0;
+    virtual uint16_t getMaxMcastAddrCount()  = 0;
 
 protected:
     void GroupAdded(FabricIndex fabric_index, const GroupInfo & new_group)
     {
-        if (mListener)
+        for (auto * listener : mListeners)
         {
-            mListener->OnGroupAdded(fabric_index, new_group);
+            if (listener != nullptr)
+            {
+                listener->OnGroupAdded(fabric_index, new_group);
+            }
         }
     }
     void GroupRemoved(FabricIndex fabric_index, const GroupInfo & old_group)
     {
-        if (mListener)
+        for (auto * listener : mListeners)
         {
-            mListener->OnGroupRemoved(fabric_index, old_group);
+            if (listener != nullptr)
+            {
+                listener->OnGroupRemoved(fabric_index, old_group);
+            }
+        }
+    }
+    void GroupModified(FabricIndex fabric_index, const GroupId & modified_group_id)
+    {
+        for (auto * listener : mListeners)
+        {
+            if (listener != nullptr)
+            {
+                listener->OnGroupModified(fabric_index, modified_group_id);
+            }
         }
     }
     const uint16_t mMaxGroupsPerFabric;
     const uint16_t mMaxGroupKeysPerFabric;
-    GroupListener * mListener = nullptr;
+    GroupListener * mListeners[kMaxListeners] = { nullptr };
 };
 
 /**
diff --git a/src/credentials/GroupDataProviderImpl.cpp b/src/credentials/GroupDataProviderImpl.cpp
index 354ca63122d..b6403c24917 100644
--- a/src/credentials/GroupDataProviderImpl.cpp
+++ b/src/credentials/GroupDataProviderImpl.cpp
@@ -870,7 +870,9 @@ CHIP_ERROR GroupDataProviderImpl::SetGroupInfo(chip::FabricIndex fabric_index, c
     {
         // Existing group_id
         group.Copy(info);
-        return group.Save(mStorage);
+        ReturnErrorOnFailure(group.Save(mStorage));
+        GroupModified(fabric_index, info.group_id);
+        return CHIP_NO_ERROR;
     }
 
     // New group_id
@@ -1096,11 +1098,13 @@ CHIP_ERROR GroupDataProviderImpl::AddEndpoint(chip::FabricIndex fabric_index, ch
         ReturnErrorOnFailure(prev.Save(mStorage));
     }
     group.endpoint_count++;
-    return group.Save(mStorage);
+    ReturnErrorOnFailure(group.Save(mStorage));
+    GroupModified(fabric_index, group.group_id);
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::GroupId group_id,
-                                                 chip::EndpointId endpoint_id)
+                                                 chip::EndpointId endpoint_id, GroupCleanupPolicy cleanupPolicy)
 {
     VerifyOrReturnError(IsInitialized(), CHIP_ERROR_INTERNAL);
 
@@ -1129,17 +1133,28 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index,
         ReturnErrorOnFailure(prev.Save(mStorage));
     }
 
-    if (group.endpoint_count > 1)
+    // Check if we should keep the group with no endpoints or not(Groupcast Sender usecase)
+    uint16_t kGroupEndpointCountMin = (cleanupPolicy == GroupCleanupPolicy::kKeepGroupIfEmpty) ? 0 : 1;
+    if (group.endpoint_count > kGroupEndpointCountMin)
     {
         group.endpoint_count--;
-        return group.Save(mStorage);
+        ReturnErrorOnFailure(group.Save(mStorage));
+        GroupModified(fabric_index, group.group_id);
+        return CHIP_NO_ERROR;
     }
 
-    // No more endpoints, remove the group
+    // No more endpoints and empty groups are not allowed: remove the group.
     return RemoveGroupInfoAt(fabric_index, group.index);
 }
 
-CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::EndpointId endpoint_id)
+CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::GroupId group_id,
+                                                 chip::EndpointId endpoint_id)
+{
+    return RemoveEndpoint(fabric_index, group_id, endpoint_id, GroupCleanupPolicy::kDeleteGroupIfEmpty);
+}
+
+CHIP_ERROR GroupDataProviderImpl::RemoveEndpointAllGroups(chip::FabricIndex fabric_index, chip::EndpointId endpoint_id,
+                                                          GroupCleanupPolicy cleanupPolicy)
 {
     VerifyOrReturnError(IsInitialized(), CHIP_ERROR_INTERNAL);
 
@@ -1161,7 +1176,7 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index,
         if (endpoint.Find(mStorage, fabric, group, endpoint_id))
         {
             // Endpoint found in group
-            ReturnErrorOnFailure(RemoveEndpoint(fabric_index, group.group_id, endpoint_id));
+            ReturnErrorOnFailure(RemoveEndpoint(fabric_index, group.group_id, endpoint_id, cleanupPolicy));
         }
 
         group.group_id = group.next;
@@ -1171,6 +1186,11 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index,
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::EndpointId endpoint_id)
+{
+    return RemoveEndpointAllGroups(fabric_index, endpoint_id, GroupCleanupPolicy::kDeleteGroupIfEmpty);
+}
+
 GroupDataProvider::GroupInfoIterator * GroupDataProviderImpl::IterateGroupInfo(chip::FabricIndex fabric_index)
 {
     VerifyOrReturnError(IsInitialized(), nullptr);
@@ -1346,7 +1366,7 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoints(chip::FabricIndex fabric_index
     group.first_endpoint = kInvalidEndpointId;
     group.endpoint_count = 0;
     ReturnErrorOnFailure(group.Save(mStorage));
-
+    GroupModified(fabric_index, group.group_id);
     return CHIP_NO_ERROR;
 }
 
@@ -1370,8 +1390,11 @@ CHIP_ERROR GroupDataProviderImpl::SetGroupKey(FabricIndex fabric_index, GroupId
         if (map.group_id == group_id)
         {
             // Existing group, replace keyset
+
             map.keyset_id = keyset_id;
-            return map.Save(mStorage);
+            ReturnErrorOnFailure(map.Save(mStorage));
+            GroupModified(fabric_index, group_id);
+            return CHIP_NO_ERROR;
         }
         map.id = map.next;
     }
@@ -1403,7 +1426,9 @@ CHIP_ERROR GroupDataProviderImpl::SetGroupKeyAt(chip::FabricIndex fabric_index,
     if (found)
     {
         // Update existing map
-        return map.Save(mStorage);
+        ReturnErrorOnFailure(map.Save(mStorage));
+        GroupModified(fabric_index, in_map.group_id);
+        return CHIP_NO_ERROR;
     }
 
     // Insert last
@@ -1428,6 +1453,7 @@ CHIP_ERROR GroupDataProviderImpl::SetGroupKeyAt(chip::FabricIndex fabric_index,
     }
     // Update fabric
     fabric.map_count++;
+    GroupModified(fabric_index, in_map.group_id);
     return fabric.Save(mStorage);
 }
 
@@ -1498,6 +1524,7 @@ CHIP_ERROR GroupDataProviderImpl::RemoveGroupKeyAt(chip::FabricIndex fabric_inde
         fabric.map_count--;
     }
     // Update fabric
+    GroupModified(fabric_index, map.group_id);
     return fabric.Save(mStorage);
 }
 
@@ -1520,6 +1547,7 @@ CHIP_ERROR GroupDataProviderImpl::RemoveGroupKeys(chip::FabricIndex fabric_index
         map.id = map.next;
     }
 
+    GroupModified(fabric_index, 0 /* all groups affected*/);
     // Update fabric
     fabric.first_map = 0;
     fabric.map_count = 0;
diff --git a/src/credentials/GroupDataProviderImpl.h b/src/credentials/GroupDataProviderImpl.h
index 655e204221e..d7dbd2e3f60 100644
--- a/src/credentials/GroupDataProviderImpl.h
+++ b/src/credentials/GroupDataProviderImpl.h
@@ -28,9 +28,15 @@ class GroupDataProviderImpl : public GroupDataProvider
 {
 public:
     static constexpr size_t kIteratorsMax         = CHIP_CONFIG_MAX_GROUP_CONCURRENT_ITERATORS;
-    static constexpr uint16_t kMaxMembershipCount = 10;
+    static constexpr uint16_t kMaxMembershipCount = CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT;
+    // Per spec, a single fabric cannot use more than half of the total memberships
+    static constexpr uint16_t kMaxMembershipPerFabric = kMaxMembershipCount / 2;
+    static constexpr uint16_t kMaxGroupKeysPerFabric  = CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC;
 
-    GroupDataProviderImpl() = default;
+    // TODO Make this configurable. Note: if PGA feature is enabled it SHALL be >= 4. else it SHALL = 1.
+    static constexpr uint16_t kMaxMcastAddrCount = 4;
+
+    GroupDataProviderImpl() : GroupDataProvider(kMaxMembershipPerFabric, kMaxGroupKeysPerFabric) {}
     GroupDataProviderImpl(uint16_t maxGroupsPerFabric, uint16_t maxGroupKeysPerFabric) :
         GroupDataProvider(maxGroupsPerFabric, maxGroupKeysPerFabric)
     {}
@@ -66,6 +72,9 @@ class GroupDataProviderImpl : public GroupDataProvider
     // Endpoints
     bool HasEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id) override;
     CHIP_ERROR AddEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id) override;
+    CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id,
+                              GroupCleanupPolicy cleanupPolicy) override;
+    CHIP_ERROR RemoveEndpointAllGroups(FabricIndex fabric_index, EndpointId endpoint_id, GroupCleanupPolicy cleanupPolicy) override;
     CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, GroupId group_id, EndpointId endpoint_id) override;
     CHIP_ERROR RemoveEndpoint(FabricIndex fabric_index, EndpointId endpoint_id) override;
     CHIP_ERROR RemoveEndpoints(FabricIndex fabric_index, GroupId group_id) override;
@@ -102,8 +111,9 @@ class GroupDataProviderImpl : public GroupDataProvider
     Crypto::SymmetricKeyContext * GetKeyContext(FabricIndex fabric_index, GroupId group_id) override;
     GroupSessionIterator * IterateGroupSessions(uint16_t session_id) override;
 
-    // Groupcast MaxMembershipCount
+    // Groupcast configurations
     uint16_t getMaxMembershipCount() override { return kMaxMembershipCount; }
+    uint16_t getMaxMcastAddrCount() override { return kMaxMcastAddrCount; }
 
 protected:
     class GroupInfoIteratorImpl : public GroupInfoIterator
diff --git a/src/crypto/BUILD.gn b/src/crypto/BUILD.gn
index f685f4d7a9d..9f7ce35f394 100644
--- a/src/crypto/BUILD.gn
+++ b/src/crypto/BUILD.gn
@@ -62,11 +62,16 @@ buildconfig_header("crypto_buildconfig") {
   chip_crypto_keystore_psa = chip_crypto_keystore == "psa"
   chip_crypto_keystore_raw = chip_crypto_keystore == "raw"
   chip_crypto_keystore_app = chip_crypto_keystore == "app"
+  chip_crypto_spake2p_mbedtls = chip_crypto_spake2p == "mbedtls"
+  chip_crypto_spake2p_psa = chip_crypto_spake2p == "psa"
+  chip_crypto_spake2p_custom = chip_crypto_spake2p == "custom"
 
   defines = [
     "CHIP_CRYPTO_MBEDTLS=${chip_crypto_mbedtls}",
     "CHIP_CRYPTO_PSA=${chip_crypto_psa}",
-    "CHIP_CRYPTO_PSA_SPAKE2P=${chip_crypto_psa_spake2p}",
+    "CHIP_CRYPTO_SPAKE2P_MBEDTLS=${chip_crypto_spake2p_mbedtls}",
+    "CHIP_CRYPTO_SPAKE2P_PSA=${chip_crypto_spake2p_psa}",
+    "CHIP_CRYPTO_SPAKE2P_CUSTOM=${chip_crypto_spake2p_custom}",
     "CHIP_CRYPTO_PSA_AEAD_SINGLE_PART=${chip_crypto_psa_aead_single_part}",
     "CHIP_CRYPTO_KEYSTORE_PSA=${chip_crypto_keystore_psa}",
     "CHIP_CRYPTO_KEYSTORE_RAW=${chip_crypto_keystore_raw}",
@@ -209,7 +214,7 @@ static_library("crypto") {
     # Keystore provided by app
   }
 
-  if (chip_crypto_psa_spake2p) {
+  if (chip_crypto_spake2p == "psa") {
     sources += [
       "PSASpake2p.cpp",
       "PSASpake2p.h",
diff --git a/src/crypto/CHIPCryptoPALPSA.cpp b/src/crypto/CHIPCryptoPALPSA.cpp
index b7f1d3682ce..7d3e0253e63 100644
--- a/src/crypto/CHIPCryptoPALPSA.cpp
+++ b/src/crypto/CHIPCryptoPALPSA.cpp
@@ -930,9 +930,7 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t &
     return CHIP_NO_ERROR;
 }
 
-// We should compile this SPAKE2P implementation only if the PSA implementation is not in use.
-#if !CHIP_CRYPTO_PSA_SPAKE2P
-
+#if CHIP_CRYPTO_SPAKE2P_MBEDTLS
 typedef struct Spake2p_Context
 {
     mbedtls_ecp_group curve;
@@ -1238,7 +1236,7 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
     return CHIP_NO_ERROR;
 }
 
-#endif // !CHIP_CRYPTO_PSA_SPAKE2P
+#endif // !CHIP_CRYPTO_SPAKE2P_MBEDTLS
 
 } // namespace Crypto
 } // namespace chip
diff --git a/src/crypto/crypto.gni b/src/crypto/crypto.gni
index 3e41491dd76..6cfb631acb9 100644
--- a/src/crypto/crypto.gni
+++ b/src/crypto/crypto.gni
@@ -20,8 +20,8 @@ declare_args() {
   # Compile mbedtls externally. Only used if chip_crypto == "mbedtls"
   chip_external_mbedtls = false
 
-  # Use PSA Spake2+ implementation. Only used if chip_crypto == "psa"
-  chip_crypto_psa_spake2p = false
+  # spake2p implementation: mbedtls, psa, custom
+  chip_crypto_spake2p = "mbedtls"
 
   # Use PSA AEAD single-part implementation. Only used if chip_crypto == "psa"
   chip_crypto_psa_aead_single_part = false
@@ -47,6 +47,3 @@ declare_args() {
 assert(
     !chip_external_mbedtls || chip_crypto == "mbedtls" || chip_crypto == "psa",
     "Use of external mbedtls requires the mbedtls or psa crypto impl")
-
-assert(!chip_crypto_psa_spake2p || chip_crypto == "psa",
-       "Use of psa spake2+ requires the psa crypto impl")
diff --git a/src/darwin/Framework/CHIP/MTRCommissioningOperation.mm b/src/darwin/Framework/CHIP/MTRCommissioningOperation.mm
index 66756e49271..a4e7093f948 100644
--- a/src/darwin/Framework/CHIP/MTRCommissioningOperation.mm
+++ b/src/darwin/Framework/CHIP/MTRCommissioningOperation.mm
@@ -123,6 +123,8 @@ static inline void emitMetricForSetupPayload(NSString * payload)
     // Just log the first VID/PID we have; that's the best we can do.
     MATTER_LOG_METRIC(kMetricDeviceVendorID, payloads[0].vendorID);
     MATTER_LOG_METRIC(kMetricDeviceProductID, payloads[0].productID);
+    uint32_t capabilities = payloads[0].rendezvousInformation.HasValue() ? payloads[0].rendezvousInformation.Value().Raw() : 0;
+    MATTER_LOG_METRIC(kMetricDeviceDiscoveryCapabilities, capabilities);
 }
 
 - (void)startWithController:(MTRDeviceController *)controller
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
index 6b21214029f..efe2f49a2a1 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
@@ -843,6 +843,7 @@ static inline void emitMetricForSetupPayload(MTRSetupPayload * payload)
 {
     MATTER_LOG_METRIC(kMetricDeviceVendorID, [payload.vendorID unsignedIntValue]);
     MATTER_LOG_METRIC(kMetricDeviceProductID, [payload.productID unsignedIntValue]);
+    MATTER_LOG_METRIC(kMetricDeviceDiscoveryCapabilities, static_cast<uint32_t>(payload.discoveryCapabilities));
 }
 
 - (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
diff --git a/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm b/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
index 6a19bfdffe9..33214f623c3 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
@@ -407,6 +407,7 @@ - (void)unitTestSubscriptionResetForDevice:(MTRDevice *)device;
 - (void)unitTestSetUTCTimeInvokedForDevice:(MTRDevice *)device error:(NSError * _Nullable)error;
 - (BOOL)unitTestTimeUpdateShortDelayIsZero:(MTRDevice *)device;
 - (BOOL)unitTestTimeSynchronizationLossDetectionCadenceIsZero:(MTRDevice *)device;
+- (void)unitTestTimeSynchronizationLossDetectedForDevice:(MTRDevice *)device;
 @end
 #endif
 
@@ -4530,22 +4531,38 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
                 [self _setCachedAttributeValue:attributeDataValue forPath:attributePath fromSubscription:isFromSubscription];
 
                 [self _attributeValue:attributeDataValue reportedForPath:attributePath];
+            }
 
-                // If we've never detected a time synchronization loss, or it's
-                // been a while since we last detected a time synchronization
-                // loss then check for a time synchronization loss now.
-                if (attributePath.cluster.unsignedLongValue == MTRClusterIDTypeTimeSynchronizationID
-                    && attributePath.attribute.unsignedLongValue == MTRAttributeIDTypeClusterTimeSynchronizationAttributeUTCTimeID
-                    && [self shouldDetectTimeSynchronizationLoss]) {
-                    auto * attrReport = [[MTRAttributeReport alloc] initWithResponseValue:attributeResponseValue error:nil];
-                    if (attrReport) {
-                        NSNumber * deviceUTCTime = attrReport.value;
-                        auto * deviceDate = MatterEpochMicrosecondsAsDate(deviceUTCTime.unsignedLongLongValue);
-                        if (std::abs([deviceDate timeIntervalSinceNow]) > MTR_DEVICE_TIME_DIFFERENCE_TRIGGERING_TIME_SYNC) {
-                            MTR_LOG("%@ Time synchronization loss detected", self);
-                            _timeSynchronizationLossDetected = YES;
-                            _timeSynchronizationLossDetectedTime = [NSDate now];
-                        }
+            // If we've never detected a time synchronization loss, or it's
+            // been a while since we last detected a time synchronization
+            // loss then check for a time synchronization loss now.
+            //
+            // This check must be done unconditionally (not just when the
+            // cache value changed) because CurrentTime has the C (non-
+            // reportable) quality.  After we set time on a device that
+            // lost time sync, our cached value stays null even though the
+            // device now has a valid time.  If the device power-cycles
+            // again and reports null, the value matches the cache and the
+            // check would be skipped.
+            if (isFromSubscription
+                && attributePath.cluster.unsignedLongValue == MTRClusterIDTypeTimeSynchronizationID
+                && attributePath.attribute.unsignedLongValue == MTRAttributeIDTypeClusterTimeSynchronizationAttributeUTCTimeID
+                && [self shouldDetectTimeSynchronizationLoss]) {
+                auto * attrReport = [[MTRAttributeReport alloc] initWithResponseValue:attributeResponseValue error:nil];
+                if (attrReport) {
+                    NSNumber * deviceUTCTime = attrReport.value;
+                    auto * deviceDate = MatterEpochMicrosecondsAsDate(deviceUTCTime.unsignedLongLongValue);
+                    if (std::abs([deviceDate timeIntervalSinceNow]) > MTR_DEVICE_TIME_DIFFERENCE_TRIGGERING_TIME_SYNC) {
+                        MTR_LOG("%@ Time synchronization loss detected", self);
+                        _timeSynchronizationLossDetected = YES;
+                        _timeSynchronizationLossDetectedTime = [NSDate now];
+#ifdef DEBUG
+                        [self _callFirstDelegateSynchronouslyWithBlock:^(id testDelegate) {
+                            if ([testDelegate respondsToSelector:@selector(unitTestTimeSynchronizationLossDetectedForDevice:)]) {
+                                [testDelegate unitTestTimeSynchronizationLossDetectedForDevice:self];
+                            }
+                        }];
+#endif
                     }
                 }
             }
diff --git a/src/darwin/Framework/CHIP/MTRMetricKeys.h b/src/darwin/Framework/CHIP/MTRMetricKeys.h
index 1d508b8701e..a909a031fa4 100644
--- a/src/darwin/Framework/CHIP/MTRMetricKeys.h
+++ b/src/darwin/Framework/CHIP/MTRMetricKeys.h
@@ -84,6 +84,10 @@ constexpr Tracing::MetricKey kMetricDeviceVendorID = "dwnfw_device_vendor_id";
 // Device Product ID
 constexpr Tracing::MetricKey kMetricDeviceProductID = "dwnfw_device_product_id";
 
+// Discovery capabilities bitmask from the setup payload (MTRDiscoveryCapabilities / RendezvousInformationFlags).
+// Bits: SoftAP=1, BLE=2, OnNetwork=4, NFC=16. Value is 0 (unknown) when not present in the payload (e.g. manual code).
+constexpr Tracing::MetricKey kMetricDeviceDiscoveryCapabilities = "dwnfw_device_discovery_capabilities";
+
 // Device Uses Thread
 constexpr Tracing::MetricKey kMetricDeviceUsesThread = "dwnfw_device_uses_thread_bool";
 
diff --git a/src/darwin/Framework/CHIP/Matter_Private.h b/src/darwin/Framework/CHIP/Matter_Private.h
new file mode 100644
index 00000000000..854dcc820bb
--- /dev/null
+++ b/src/darwin/Framework/CHIP/Matter_Private.h
@@ -0,0 +1,28 @@
+/**
+ *
+ *    Copyright (c) 2020-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.
+ */
+
+#import <Matter/Matter.h>
+
+#define MTR_INCLUDED_FROM_PRIVATE_UMBRELLA_HEADER
+
+#import <Matter/MTRBaseClusters_Private.h>
+#import <Matter/MTRClusterConstants_Private.h>
+#import <Matter/MTRClusters_Private.h>
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
+#import <Matter/MTRStructsObjc_Private.h>
+
+#undef MTR_INCLUDED_FROM_PRIVATE_UMBRELLA_HEADER
diff --git a/src/darwin/Framework/CHIP/Matter_Private.modulemap b/src/darwin/Framework/CHIP/Matter_Private.modulemap
new file mode 100644
index 00000000000..a1580a79aad
--- /dev/null
+++ b/src/darwin/Framework/CHIP/Matter_Private.modulemap
@@ -0,0 +1,9 @@
+framework module Matter_Private [system] {
+    umbrella header "Matter_Private.h"
+    export *
+
+    explicit module LocalTestStorage {
+        header "MTRDeviceControllerLocalTestStorage.h"
+        export *
+    }
+}
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Private.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Private.zapt
index b38c29072d1..c08d68b3c4e 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Private.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Private.zapt
@@ -5,7 +5,7 @@
 #import <Matter/MTRClusterStateCacheContainer.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRCommandPayloadsObjc.h>
-#import "MTRCommandPayloadsObjc_Private.h"
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
 
 NS_ASSUME_NONNULL_BEGIN
 {{> placeholder_comment}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusterConstants_Private.zapt b/src/darwin/Framework/CHIP/templates/MTRClusterConstants_Private.zapt
index 3d49bd8e07c..fb15244ea9a 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusterConstants_Private.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusterConstants_Private.zapt
@@ -7,6 +7,7 @@
 #pragma mark - Private Cluster IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateClusterIDType) {
+    MTRPrivateClusterIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 {{#zcl_clusters}}
 {{#if (isInConfigList (asUpperCamelCase name preserveAcronyms=true) "DarwinPrivateClusters")}}
 {{#if (isSupported (asUpperCamelCase label preserveAcronyms=true) isForIds=true)}}
@@ -20,6 +21,7 @@ typedef NS_ENUM(uint32_t, MTRPrivateClusterIDType) {
 #pragma mark - Private Attribute IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateAttributeIDType) {
+    MTRPrivateAttributeIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 {{#zcl_clusters}}
 {{#if (isInConfigList (asUpperCamelCase name preserveAcronyms=true) "DarwinPrivateClusters")}}
 {{#*inline "attributeIDs"}}
@@ -61,6 +63,7 @@ typedef NS_ENUM(uint32_t, MTRPrivateAttributeIDType) {
 #pragma mark - Private Command IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateCommandIDType) {
+    MTRPrivateCommandIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 {{#zcl_clusters}}
 {{#if (isInConfigList (asUpperCamelCase name preserveAcronyms=true) "DarwinPrivateClusters")}}
 {{#*inline "commandIDs"}}
@@ -98,6 +101,7 @@ typedef NS_ENUM(uint32_t, MTRPrivateCommandIDType) {
 #pragma mark - Private Event IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateEventIDType) {
+    MTRPrivateEventIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 {{#zcl_clusters}}
 {{#if (isInConfigList (asUpperCamelCase name preserveAcronyms=true) "DarwinPrivateClusters")}}
 {{#*inline "eventIDs"}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters_Private.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters_Private.zapt
index c0df049bc55..e3832117f77 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters_Private.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters_Private.zapt
@@ -2,9 +2,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MTRClusters.h"
-#import "MTRDevice.h"
-#import "MTRCommandPayloadsObjc_Private.h"
+#import <Matter/MTRClusters.h>
+#import <Matter/MTRDevice.h>
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
 
 NS_ASSUME_NONNULL_BEGIN
 {{> placeholder_comment}}
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Cluster {{name}}
  *    {{description}}
  */
+MTR_PROVISIONALLY_AVAILABLE
 @interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRGenericCluster
 
 {{> commandDeclarations}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc_Private.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc_Private.zapt
index eee8fae4619..98a0748622e 100644
--- a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc_Private.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc_Private.zapt
@@ -3,7 +3,7 @@
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRCommandPayloadsObjc.h>
 #import <Matter/MTRStructsObjc.h>
-#import "MTRStructsObjc_Private.h"
+#import <Matter/MTRStructsObjc_Private.h>
 
 NS_ASSUME_NONNULL_BEGIN
 {{> placeholder_comment}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandPayloads_Private.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandPayloads_Private.zapt
index 1f03cb3ae0c..022318de113 100644
--- a/src/darwin/Framework/CHIP/templates/MTRCommandPayloads_Private.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRCommandPayloads_Private.zapt
@@ -2,7 +2,7 @@
 
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRCommandPayloadsObjc.h>
-#import "MTRCommandPayloadsObjc_Private.h"
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index bb79a82413e..afe131372e7 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
@@ -1617,6 +1617,9 @@ static BOOL AttributeIsSpecifiedInGroupKeyManagementCluster(AttributeId aAttribu
     case Attributes::MaxGroupKeysPerFabric::Id: {
         return YES;
     }
+    case Attributes::GroupcastAdoption::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -2299,6 +2302,9 @@ static BOOL AttributeIsSpecifiedInSmokeCOAlarmCluster(AttributeId aAttributeId)
     case Attributes::ExpiryDate::Id: {
         return YES;
     }
+    case Attributes::Unmounted::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -5368,10 +5374,16 @@ static BOOL AttributeIsSpecifiedInAmbientContextSensingCluster(AttributeId aAttr
     case Attributes::AmbientContextTypeSupported::Id: {
         return YES;
     }
-    case Attributes::SimultaneousDetectionLimit::Id: {
+    case Attributes::ObjectCountReached::Id: {
         return YES;
     }
-    case Attributes::ObjectCountReached::Id: {
+    case Attributes::ObjectCountConfig::Id: {
+        return YES;
+    }
+    case Attributes::ObjectCount::Id: {
+        return YES;
+    }
+    case Attributes::SimultaneousDetectionLimit::Id: {
         return YES;
     }
     case Attributes::HoldTime::Id: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 1de44ea9949..a90f1964159 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -5141,6 +5141,34 @@ static id _Nullable DecodeAttributeValueForGroupKeyManagementCluster(AttributeId
         value = [NSNumber numberWithUnsignedShort:cppValue];
         return value;
     }
+    case Attributes::GroupcastAdoption::Id: {
+        using TypeInfo = Attributes::GroupcastAdoption::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                MTRGroupKeyManagementClusterGroupcastAdoptionStruct * newElement_0;
+                newElement_0 = [MTRGroupKeyManagementClusterGroupcastAdoptionStruct new];
+                newElement_0.groupcastAdopted = [NSNumber numberWithBool:entry_0.groupcastAdopted];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
     default: {
         // Not a known GroupKeyManagement attribute.
         break;
@@ -6703,6 +6731,17 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
+    case Attributes::Unmounted::Id: {
+        using TypeInfo = Attributes::Unmounted::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithBool:cppValue];
+        return value;
+    }
     default: {
         // Not a known SmokeCOAlarm attribute.
         break;
@@ -16494,16 +16533,6 @@ static id _Nullable DecodeAttributeValueForAmbientContextSensingCluster(Attribut
                 } else {
                     newElement_0.detectionStartTime = nil;
                 }
-                if (entry_0.objectCountThreshold.HasValue()) {
-                    newElement_0.objectCountThreshold = [NSNumber numberWithUnsignedShort:entry_0.objectCountThreshold.Value()];
-                } else {
-                    newElement_0.objectCountThreshold = nil;
-                }
-                if (entry_0.objectCount.HasValue()) {
-                    newElement_0.objectCount = [NSNumber numberWithUnsignedShort:entry_0.objectCount.Value()];
-                } else {
-                    newElement_0.objectCount = nil;
-                }
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -16562,26 +16591,71 @@ static id _Nullable DecodeAttributeValueForAmbientContextSensingCluster(Attribut
         }
         return value;
     }
-    case Attributes::SimultaneousDetectionLimit::Id: {
-        using TypeInfo = Attributes::SimultaneousDetectionLimit::TypeInfo;
+    case Attributes::ObjectCountReached::Id: {
+        using TypeInfo = Attributes::ObjectCountReached::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-    case Attributes::ObjectCountReached::Id: {
-        using TypeInfo = Attributes::ObjectCountReached::TypeInfo;
+    case Attributes::ObjectCountConfig::Id: {
+        using TypeInfo = Attributes::ObjectCountConfig::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull value;
+        value = [MTRAmbientContextSensingClusterObjectCountConfigStruct new];
+        value.countingObject = [MTRDataTypeSemanticTagStruct new];
+        if (cppValue.countingObject.mfgCode.IsNull()) {
+            value.countingObject.mfgCode = nil;
+        } else {
+            value.countingObject.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue.countingObject.mfgCode.Value())];
+        }
+        value.countingObject.namespaceID = [NSNumber numberWithUnsignedChar:cppValue.countingObject.namespaceID];
+        value.countingObject.tag = [NSNumber numberWithUnsignedChar:cppValue.countingObject.tag];
+        if (cppValue.countingObject.label.HasValue()) {
+            if (cppValue.countingObject.label.Value().IsNull()) {
+                value.countingObject.label = nil;
+            } else {
+                value.countingObject.label = AsString(cppValue.countingObject.label.Value().Value());
+                if (value.countingObject.label == nil) {
+                    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                    *aError = err;
+                    return nil;
+                }
+            }
+        } else {
+            value.countingObject.label = nil;
+        }
+        value.objectCountThreshold = [NSNumber numberWithUnsignedShort:cppValue.objectCountThreshold];
+        return value;
+    }
+    case Attributes::ObjectCount::Id: {
+        using TypeInfo = Attributes::ObjectCount::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithBool:cppValue];
+        value = [NSNumber numberWithUnsignedShort:cppValue];
+        return value;
+    }
+    case Attributes::SimultaneousDetectionLimit::Id: {
+        using TypeInfo = Attributes::SimultaneousDetectionLimit::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
     case Attributes::HoldTime::Id: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 0e3f68c2c24..1d8aef1b2e2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -3924,25 +3924,25 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 /**
  * Command KeySetWrite
  *
- * Write a new set of keys for the given key set id.
+ * This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys.
  */
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 /**
  * Command KeySetRead
  *
- * Read the keys for a given key set id.
+ * This command is used by Administrators to read the state of a given Group Key Set.
  */
 - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)params completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 /**
  * Command KeySetRemove
  *
- * Revoke a Root Key from a Group
+ * This command is used by Administrators to remove all state of a given Group Key Set.
  */
 - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 /**
  * Command KeySetReadAllIndices
  *
- * Return the list of Group Key Sets associated with the accessing fabric
+ * This command is used by Administrators to query a list of all Group Key Sets associated with the accessing fabric.
  */
 - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)keySetReadAllIndicesWithCompletion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion
@@ -3974,6 +3974,14 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 + (void)readAttributeMaxGroupKeysPerFabricWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+- (void)readAttributeGroupcastAdoptionWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeGroupcastAdoptionWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeGroupcastAdoptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -5579,6 +5587,12 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 + (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
+- (void)readAttributeUnmountedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeUnmountedWithParams:(MTRSubscribeParams *)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeUnmountedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
                                  subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -12953,7 +12967,7 @@ MTR_PROVISIONALLY_AVAILABLE
 /**
  * Cluster Ambient Context Sensing
  *
- * This cluster provides data modeling and protocol implementation of ambient context sensing features.
+ * This server cluster provides an interface to ambient context sensing functionality.
  */
 MTR_PROVISIONALLY_AVAILABLE
 @interface MTRBaseClusterAmbientContextSensing : MTRGenericBaseCluster
@@ -12988,6 +13002,26 @@ MTR_PROVISIONALLY_AVAILABLE
                                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeAmbientContextTypeSupportedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
+- (void)readAttributeObjectCountReachedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeObjectCountReachedWithParams:(MTRSubscribeParams *)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeObjectCountReachedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeObjectCountConfigWithCompletion:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeObjectCountConfigWithValue:(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeObjectCountConfigWithValue:(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeObjectCountConfigWithParams:(MTRSubscribeParams *)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeObjectCountConfigWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeObjectCountWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeObjectCountWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeObjectCountWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)readAttributeSimultaneousDetectionLimitWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -12996,12 +13030,6 @@ MTR_PROVISIONALLY_AVAILABLE
                                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeSimultaneousDetectionLimitWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeObjectCountReachedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeObjectCountReachedWithParams:(MTRSubscribeParams *)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeObjectCountReachedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
 - (void)readAttributeHoldTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeHoldTimeWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeHoldTimeWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -19039,7 +19067,6 @@ typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFaultType) {
 
 typedef NS_OPTIONS(uint32_t, MTRGeneralDiagnosticsFeature) {
     MTRGeneralDiagnosticsFeatureDataModelTest MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)) = 0x1,
-    MTRGeneralDiagnosticsFeatureDeviceLoad MTR_PROVISIONALLY_AVAILABLE = 0x2,
 } MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 typedef NS_OPTIONS(uint32_t, MTRSoftwareDiagnosticsFeature) {
@@ -19318,6 +19345,11 @@ typedef NS_ENUM(uint8_t, MTROperationalCredentialsOperationalCertStatus) {
     MTROperationalCredentialsOperationalCertStatusInvalidFabricIndex MTR_DEPRECATED("Please use MTROperationalCredentialsNodeOperationalCertStatusInvalidFabricIndex", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x0B,
 } MTR_DEPRECATED("Please use MTROperationalCredentialsNodeOperationalCertStatus", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
+typedef NS_ENUM(uint8_t, MTRGroupKeyManagementGroupKeyMulticastPolicy) {
+    MTRGroupKeyManagementGroupKeyMulticastPolicyPerGroupID MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRGroupKeyManagementGroupKeyMulticastPolicyAllNodes MTR_PROVISIONALLY_AVAILABLE = 0x01,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRGroupKeyManagementGroupKeySecurityPolicy) {
     MTRGroupKeyManagementGroupKeySecurityPolicyTrustFirst MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRGroupKeyManagementGroupKeySecurityPolicyCacheAndSync MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
@@ -19325,6 +19357,7 @@ typedef NS_ENUM(uint8_t, MTRGroupKeyManagementGroupKeySecurityPolicy) {
 
 typedef NS_OPTIONS(uint32_t, MTRGroupKeyManagementFeature) {
     MTRGroupKeyManagementFeatureCacheAndSync MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRGroupKeyManagementFeatureGroupcast MTR_PROVISIONALLY_AVAILABLE = 0x2,
 } MTR_PROVISIONALLY_AVAILABLE;
 
 typedef NS_OPTIONS(uint32_t, MTRBooleanStateFeature) {
@@ -19602,6 +19635,7 @@ typedef NS_ENUM(uint8_t, MTRSmokeCOAlarmExpressedState) {
     MTRSmokeCOAlarmExpressedStateEndOfService MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x06,
     MTRSmokeCOAlarmExpressedStateInterconnectSmoke MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x07,
     MTRSmokeCOAlarmExpressedStateInterconnectCO MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x08,
+    MTRSmokeCOAlarmExpressedStateInoperative MTR_PROVISIONALLY_AVAILABLE = 0x09,
 } MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
 typedef NS_ENUM(uint8_t, MTRSmokeCOAlarmMuteState) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index bea9414d0cd..1dc24cd1f9c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -32828,6 +32828,93 @@ + (void)readAttributeMaxGroupKeysPerFabricWithClusterStateCache:(MTRClusterState
                                      completion:completion];
 }
 
+- (void)readAttributeGroupcastAdoptionWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = GroupKeyManagement::Attributes::GroupcastAdoption::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:self.endpointID
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:params
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeGroupcastAdoptionWithValue:(NSArray * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = GroupKeyManagement::Attributes::GroupcastAdoption::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                auto element_0 = MTR_SAFE_CAST(value[i_0], MTRGroupKeyManagementClusterGroupcastAdoptionStruct);
+                if (!element_0) {
+                  // Wrong kind of value.
+                  MTR_LOG_ERROR("%@ incorrectly present in list of %@", value[i_0], NSStringFromClass(MTRGroupKeyManagementClusterGroupcastAdoptionStruct.class));
+                  return CHIP_ERROR_INVALID_ARGUMENT;
+                }
+                     listHolder_0->mList[i_0].groupcastAdopted = element_0.groupcastAdopted.boolValue;
+     listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
+            }
+          }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpointID.unsignedShortValue);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeGroupcastAdoptionWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = GroupKeyManagement::Attributes::GroupcastAdoption::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeGroupcastAdoptionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = GroupKeyManagement::Attributes::GroupcastAdoption::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
@@ -40961,6 +41048,42 @@ + (void)readAttributeExpiryDateWithClusterStateCache:(MTRClusterStateCacheContai
                                      completion:completion];
 }
 
+- (void)readAttributeUnmountedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::Unmounted::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:self.endpointID
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeUnmountedWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::Unmounted::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeUnmountedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = SmokeCoAlarm::Attributes::Unmounted::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
     using TypeInfo = SmokeCoAlarm::Attributes::GeneratedCommandList::TypeInfo;
@@ -89783,9 +89906,9 @@ + (void)readAttributeAmbientContextTypeSupportedWithClusterStateCache:(MTRCluste
                                      completion:completion];
 }
 
-- (void)readAttributeSimultaneousDetectionLimitWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeObjectCountReachedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:self.endpointID
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -89794,11 +89917,47 @@ - (void)readAttributeSimultaneousDetectionLimitWithCompletion:(void (^)(NSNumber
                                         completion:completion];
 }
 
-- (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+- (void)subscribeAttributeObjectCountReachedWithParams:(MTRSubscribeParams * _Nonnull)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
 }
-- (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+
++ (void)readAttributeObjectCountReachedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeObjectCountConfigWithCompletion:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountConfig::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:self.endpointID
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeObjectCountConfigWithValue:(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeObjectCountConfigWithValue:(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeObjectCountConfigWithValue:(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
@@ -89813,20 +89972,37 @@ - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)v
         }
 
         ListFreer listFreer;
-        using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+        using TypeInfo = AmbientContextSensing::Attributes::ObjectCountConfig::TypeInfo;
         TypeInfo::Type cppValue;
-          cppValue = value.unsignedCharValue;
+                if (value.countingObject.mfgCode == nil) {
+       cppValue.countingObject.mfgCode.SetNull();
+     } else {
+       auto & nonNullValue_2 = cppValue.countingObject.mfgCode.SetNonNull();
+         nonNullValue_2 = static_cast<std::remove_reference_t<decltype(nonNullValue_2)>>(value.countingObject.mfgCode.unsignedShortValue);
+  }
+     cppValue.countingObject.namespaceID = value.countingObject.namespaceID.unsignedCharValue;
+     cppValue.countingObject.tag = value.countingObject.tag.unsignedCharValue;
+     if (value.countingObject.label != nil) {
+       auto & definedValue_2 = cppValue.countingObject.label.Emplace();
+         if (value.countingObject.label == nil) {
+           definedValue_2.SetNull();
+         } else {
+           auto & nonNullValue_3 = definedValue_2.SetNonNull();
+             nonNullValue_3 = AsCharSpan(value.countingObject.label);
+         }
+     }
+     cppValue.objectCountThreshold = value.objectCountThreshold.unsignedShortValue;
 
         chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpointID.unsignedShortValue);
         return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
-- (void)subscribeAttributeSimultaneousDetectionLimitWithParams:(MTRSubscribeParams * _Nonnull)params
-                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeObjectCountConfigWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountConfig::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -89836,9 +90012,9 @@ - (void)subscribeAttributeSimultaneousDetectionLimitWithParams:(MTRSubscribePara
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeSimultaneousDetectionLimitWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeObjectCountConfigWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountConfig::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -89847,9 +90023,9 @@ + (void)readAttributeSimultaneousDetectionLimitWithClusterStateCache:(MTRCluster
                                      completion:completion];
 }
 
-- (void)readAttributeObjectCountReachedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeObjectCountWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCount::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:self.endpointID
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -89858,11 +90034,11 @@ - (void)readAttributeObjectCountReachedWithCompletion:(void (^)(NSNumber * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeObjectCountReachedWithParams:(MTRSubscribeParams * _Nonnull)params
-                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeObjectCountWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCount::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -89872,9 +90048,73 @@ - (void)subscribeAttributeObjectCountReachedWithParams:(MTRSubscribeParams * _No
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeObjectCountReachedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeObjectCountWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = AmbientContextSensing::Attributes::ObjectCountReached::TypeInfo;
+    using TypeInfo = AmbientContextSensing::Attributes::ObjectCount::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSimultaneousDetectionLimitWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:self.endpointID
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    // Make a copy of params before we go async.
+    params = [params copy];
+    value = [value copy];
+
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
+
+        ListFreer listFreer;
+        using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = value.unsignedCharValue;
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpointID.unsignedShortValue);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
+    std::move(*bridge).DispatchAction(self.device);
+}
+
+- (void)subscribeAttributeSimultaneousDetectionLimitWithParams:(MTRSubscribeParams * _Nonnull)params
+                                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSimultaneousDetectionLimitWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = AmbientContextSensing::Attributes::SimultaneousDetectionLimit::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Private.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Private.h
index 582ebeed739..fca9a040b23 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Private.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Private.h
@@ -15,11 +15,11 @@
  *    limitations under the License.
  */
 
-#import "MTRCommandPayloadsObjc_Private.h"
 #import <Matter/MTRBaseClusters.h>
 #import <Matter/MTRCluster.h>
 #import <Matter/MTRClusterStateCacheContainer.h>
 #import <Matter/MTRCommandPayloadsObjc.h>
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
 #import <Matter/MTRDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 26a339aa9bb..d2c8795ddb2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -1628,6 +1628,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeGroupTableID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000001,
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeMaxGroupsPerFabricID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000002,
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeMaxGroupKeysPerFabricID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000003,
+    MTRAttributeIDTypeClusterGroupKeyManagementAttributeGroupcastAdoptionID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterGroupKeyManagementAttributeAttributeListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAttributeListID,
@@ -1896,6 +1897,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeContaminationStateID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x0000000A,
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeSmokeSensitivityLevelID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x0000000B,
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpiryDateID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = 0x0000000C,
+    MTRAttributeIDTypeClusterSmokeCOAlarmAttributeUnmountedID MTR_PROVISIONALLY_AVAILABLE = 0x0000000D,
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeGeneratedCommandListID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAcceptedCommandListID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterSmokeCOAlarmAttributeAttributeListID MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6)) = MTRAttributeIDTypeGlobalAttributeAttributeListID,
@@ -3511,11 +3513,13 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeAudioContextDetectedID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeAmbientContextTypeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeAmbientContextTypeSupportedID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
-    MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
-    MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountReachedID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
-    MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
-    MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeLimitsID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
-    MTRAttributeIDTypeClusterAmbientContextSensingAttributePredictedActivityID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountReachedID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountConfigID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeLimitsID MTR_PROVISIONALLY_AVAILABLE = 0x0000000A,
+    MTRAttributeIDTypeClusterAmbientContextSensingAttributePredictedActivityID MTR_PROVISIONALLY_AVAILABLE = 0x0000000B,
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterAmbientContextSensingAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID,
@@ -6957,7 +6961,8 @@ typedef NS_ENUM(uint32_t, MTREventIDType) {
     MTREventIDTypeClusterOccupancySensingEventOccupancyChangedID MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)) = 0x00000000,
 
     // Cluster AmbientContextSensing events
-    MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectedID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectStartedID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectEndedID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
 
     // Cluster TargetNavigator deprecated event names
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants_Private.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants_Private.h
index 4039d4a368b..846cc1bf000 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants_Private.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants_Private.h
@@ -22,19 +22,23 @@
 #pragma mark - Private Cluster IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateClusterIDType) {
+    MTRPrivateClusterIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 };
 
 #pragma mark - Private Attribute IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateAttributeIDType) {
+    MTRPrivateAttributeIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 };
 
 #pragma mark - Private Command IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateCommandIDType) {
+    MTRPrivateCommandIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 };
 
 #pragma mark - Private Event IDs
 
 typedef NS_ENUM(uint32_t, MTRPrivateEventIDType) {
+    MTRPrivateEventIDTypeReserved MTR_NEWLY_AVAILABLE = 0xFFFFFFFF,
 };
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
index 2c2f6227c22..dae6633739b 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
@@ -2546,6 +2546,10 @@
             result = @"MaxGroupKeysPerFabric";
             break;
 
+        case MTRAttributeIDTypeClusterGroupKeyManagementAttributeGroupcastAdoptionID:
+            result = @"GroupcastAdoption";
+            break;
+
         case MTRAttributeIDTypeClusterGroupKeyManagementAttributeGeneratedCommandListID:
             result = @"GeneratedCommandList";
             break;
@@ -3430,6 +3434,10 @@
             result = @"ExpiryDate";
             break;
 
+        case MTRAttributeIDTypeClusterSmokeCOAlarmAttributeUnmountedID:
+            result = @"Unmounted";
+            break;
+
         case MTRAttributeIDTypeClusterSmokeCOAlarmAttributeGeneratedCommandListID:
             result = @"GeneratedCommandList";
             break;
@@ -7450,14 +7458,22 @@
             result = @"AmbientContextTypeSupported";
             break;
 
-        case MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID:
-            result = @"SimultaneousDetectionLimit";
-            break;
-
         case MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountReachedID:
             result = @"ObjectCountReached";
             break;
 
+        case MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountConfigID:
+            result = @"ObjectCountConfig";
+            break;
+
+        case MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountID:
+            result = @"ObjectCount";
+            break;
+
+        case MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID:
+            result = @"SimultaneousDetectionLimit";
+            break;
+
         case MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeID:
             result = @"HoldTime";
             break;
@@ -16085,8 +16101,12 @@
         switch (eventID) {
 
             // Cluster AmbientContextSensing events
-        case MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectedID:
-            result = @"AmbientContextDetected";
+        case MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectStartedID:
+            result = @"AmbientContextDetectStarted";
+            break;
+
+        case MTREventIDTypeClusterAmbientContextSensingEventAmbientContextDetectEndedID:
+            result = @"AmbientContextDetectEnded";
             break;
 
         default:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index 2c8e66151aa..2e015bce20e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -1814,6 +1814,10 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxGroupKeysPerFabricWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGroupcastAdoptionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -2654,6 +2658,8 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeExpiryDateWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUnmountedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
@@ -6027,7 +6033,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 /**
  * Cluster Ambient Context Sensing
- *    This cluster provides data modeling and protocol implementation of ambient context sensing features.
+ *    This server cluster provides an interface to ambient context sensing functionality.
  */
 MTR_PROVISIONALLY_AVAILABLE
 @interface MTRClusterAmbientContextSensing : MTRGenericCluster
@@ -6042,12 +6048,18 @@ MTR_PROVISIONALLY_AVAILABLE
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAmbientContextTypeSupportedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountReachedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountConfigWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeObjectCountConfigWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeObjectCountConfigWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSimultaneousDetectionLimitWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountReachedWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeHoldTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeHoldTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeHoldTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index b1b3b064378..56008f87df4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -5668,6 +5668,22 @@ - (void)writeAttributeGroupKeyMapWithValue:(NSDictionary<NSString *, id> *)dataV
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeGroupKeyManagementID) attributeID:@(MTRAttributeIDTypeClusterGroupKeyManagementAttributeMaxGroupKeysPerFabricID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGroupcastAdoptionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeGroupKeyManagementID) attributeID:@(MTRAttributeIDTypeClusterGroupKeyManagementAttributeGroupcastAdoptionID) params:params];
+}
+
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeGroupcastAdoptionWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeGroupcastAdoptionWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeGroupKeyManagementID) attributeID:@(MTRAttributeIDTypeClusterGroupKeyManagementAttributeGroupcastAdoptionID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeGroupKeyManagementID) attributeID:@(MTRAttributeIDTypeClusterGroupKeyManagementAttributeGeneratedCommandListID) params:params];
@@ -7223,6 +7239,11 @@ - (void)writeAttributeSmokeSensitivityLevelWithValue:(NSDictionary<NSString *, i
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeExpiryDateID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUnmountedWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeUnmountedID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeSmokeCOAlarmID) attributeID:@(MTRAttributeIDTypeClusterSmokeCOAlarmAttributeGeneratedCommandListID) params:params];
@@ -16580,6 +16601,32 @@ @implementation MTRClusterAmbientContextSensing
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeAmbientContextTypeSupportedID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountReachedWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountReachedID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountConfigWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountConfigID) params:params];
+}
+
+- (void)writeAttributeObjectCountConfigWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [self writeAttributeObjectCountConfigWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+}
+- (void)writeAttributeObjectCountConfigWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+{
+    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
+
+    [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountConfigID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSimultaneousDetectionLimitWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID) params:params];
@@ -16596,11 +16643,6 @@ - (void)writeAttributeSimultaneousDetectionLimitWithValue:(NSDictionary<NSString
     [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeSimultaneousDetectionLimitID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeObjectCountReachedWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeObjectCountReachedID) params:params];
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeHoldTimeWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeAmbientContextSensingID) attributeID:@(MTRAttributeIDTypeClusterAmbientContextSensingAttributeHoldTimeID) params:params];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Private.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Private.h
index e19dc2e0053..c094612d441 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Private.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Private.h
@@ -17,9 +17,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MTRClusters.h"
-#import "MTRCommandPayloadsObjc_Private.h"
-#import "MTRDevice.h"
+#import <Matter/MTRClusters.h>
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
+#import <Matter/MTRDevice.h>
 
 NS_ASSUME_NONNULL_BEGIN
 // Nothing here for now, but leaving this file in place in case we need to add
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 9389e3b5e0f..0d21609749b 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -10023,6 +10023,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
             auto & nonNullValue_1 = encodableStruct.groupKeySet.epochStartTime2.SetNonNull();
             nonNullValue_1 = self.groupKeySet.epochStartTime2.unsignedLongLongValue;
         }
+        encodableStruct.groupKeySet.groupKeyMulticastPolicy = static_cast<std::remove_reference_t<decltype(encodableStruct.groupKeySet.groupKeyMulticastPolicy)>>(self.groupKeySet.groupKeyMulticastPolicy.unsignedCharValue);
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -10259,6 +10260,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GroupKey
         } else {
             self.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:decodableStruct.groupKeySet.epochStartTime2.Value()];
         }
+        self.groupKeySet.groupKeyMulticastPolicy = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.groupKeySet.groupKeyMulticastPolicy)];
     }
     return CHIP_NO_ERROR;
 }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc_Private.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc_Private.h
index a2c1e0bb99a..070810b1541 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc_Private.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc_Private.h
@@ -15,10 +15,10 @@
  *    limitations under the License.
  */
 
-#import "MTRStructsObjc_Private.h"
 #import <Matter/MTRCommandPayloadsObjc.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRStructsObjc.h>
+#import <Matter/MTRStructsObjc_Private.h>
 
 NS_ASSUME_NONNULL_BEGIN
 // Nothing here for now, but leaving this file in place in case we need to add
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Private.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Private.h
index 6c2a096796d..58aad6ac2d4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Private.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Private.h
@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 
-#import "MTRCommandPayloadsObjc_Private.h"
 #import <Matter/MTRCommandPayloadsObjc.h>
+#import <Matter/MTRCommandPayloadsObjc_Private.h>
 #import <Matter/MTRDefines.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 1b11cda787b..739b3f376cf 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -4805,87 +4805,107 @@ static id _Nullable DecodeEventPayloadForAmbientContextSensingCluster(EventId aE
 {
     using namespace Clusters::AmbientContextSensing;
     switch (aEventId) {
-    case Events::AmbientContextDetected::Id: {
-        Events::AmbientContextDetected::DecodableType cppValue;
+    case Events::AmbientContextDetectStarted::Id: {
+        Events::AmbientContextDetectStarted::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
 
-        __auto_type * value = [MTRAmbientContextSensingClusterAmbientContextDetectedEvent new];
+        __auto_type * value = [MTRAmbientContextSensingClusterAmbientContextDetectStartedEvent new];
 
         do {
-            NSArray * _Nonnull memberValue;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.ambientContextType.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    MTRAmbientContextSensingClusterAmbientContextTypeStruct * newElement_0;
-                    newElement_0 = [MTRAmbientContextSensingClusterAmbientContextTypeStruct new];
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.ambientContextSensed.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            MTRDataTypeSemanticTagStruct * newElement_2;
-                            newElement_2 = [MTRDataTypeSemanticTagStruct new];
-                            if (entry_2.mfgCode.IsNull()) {
-                                newElement_2.mfgCode = nil;
-                            } else {
-                                newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())];
-                            }
-                            newElement_2.namespaceID = [NSNumber numberWithUnsignedChar:entry_2.namespaceID];
-                            newElement_2.tag = [NSNumber numberWithUnsignedChar:entry_2.tag];
-                            if (entry_2.label.HasValue()) {
-                                if (entry_2.label.Value().IsNull()) {
-                                    newElement_2.label = nil;
+            NSArray * _Nullable memberValue;
+            if (cppValue.ambientContextType.HasValue()) {
+                { // Scope for our temporary variables
+                    auto * array_1 = [NSMutableArray new];
+                    auto iter_1 = cppValue.ambientContextType.Value().begin();
+                    while (iter_1.Next()) {
+                        auto & entry_1 = iter_1.GetValue();
+                        MTRAmbientContextSensingClusterAmbientContextTypeStruct * newElement_1;
+                        newElement_1 = [MTRAmbientContextSensingClusterAmbientContextTypeStruct new];
+                        { // Scope for our temporary variables
+                            auto * array_3 = [NSMutableArray new];
+                            auto iter_3 = entry_1.ambientContextSensed.begin();
+                            while (iter_3.Next()) {
+                                auto & entry_3 = iter_3.GetValue();
+                                MTRDataTypeSemanticTagStruct * newElement_3;
+                                newElement_3 = [MTRDataTypeSemanticTagStruct new];
+                                if (entry_3.mfgCode.IsNull()) {
+                                    newElement_3.mfgCode = nil;
                                 } else {
-                                    newElement_2.label = AsString(entry_2.label.Value().Value());
-                                    if (newElement_2.label == nil) {
-                                        CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-                                        *aError = err;
-                                        return nil;
+                                    newElement_3.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_3.mfgCode.Value())];
+                                }
+                                newElement_3.namespaceID = [NSNumber numberWithUnsignedChar:entry_3.namespaceID];
+                                newElement_3.tag = [NSNumber numberWithUnsignedChar:entry_3.tag];
+                                if (entry_3.label.HasValue()) {
+                                    if (entry_3.label.Value().IsNull()) {
+                                        newElement_3.label = nil;
+                                    } else {
+                                        newElement_3.label = AsString(entry_3.label.Value().Value());
+                                        if (newElement_3.label == nil) {
+                                            CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+                                            *aError = err;
+                                            return nil;
+                                        }
                                     }
+                                } else {
+                                    newElement_3.label = nil;
                                 }
-                            } else {
-                                newElement_2.label = nil;
+                                [array_3 addObject:newElement_3];
                             }
-                            [array_2 addObject:newElement_2];
+                            CHIP_ERROR err = iter_3.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            newElement_1.ambientContextSensed = array_3;
                         }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
+                        if (entry_1.detectionStartTime.HasValue()) {
+                            newElement_1.detectionStartTime = [NSNumber numberWithUnsignedInt:entry_1.detectionStartTime.Value()];
+                        } else {
+                            newElement_1.detectionStartTime = nil;
                         }
-                        newElement_0.ambientContextSensed = array_2;
+                        [array_1 addObject:newElement_1];
                     }
-                    if (entry_0.detectionStartTime.HasValue()) {
-                        newElement_0.detectionStartTime = [NSNumber numberWithUnsignedInt:entry_0.detectionStartTime.Value()];
-                    } else {
-                        newElement_0.detectionStartTime = nil;
-                    }
-                    if (entry_0.objectCountThreshold.HasValue()) {
-                        newElement_0.objectCountThreshold = [NSNumber numberWithUnsignedShort:entry_0.objectCountThreshold.Value()];
-                    } else {
-                        newElement_0.objectCountThreshold = nil;
-                    }
-                    if (entry_0.objectCount.HasValue()) {
-                        newElement_0.objectCount = [NSNumber numberWithUnsignedShort:entry_0.objectCount.Value()];
-                    } else {
-                        newElement_0.objectCount = nil;
+                    CHIP_ERROR err = iter_1.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
                     }
-                    [array_0 addObject:newElement_0];
+                    memberValue = array_1;
                 }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                memberValue = array_0;
+            } else {
+                memberValue = nil;
             }
             value.ambientContextType = memberValue;
         } while (0);
+        do {
+            NSNumber * _Nullable memberValue;
+            if (cppValue.objectCount.HasValue()) {
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.objectCount.Value()];
+            } else {
+                memberValue = nil;
+            }
+            value.objectCount = memberValue;
+        } while (0);
+
+        return value;
+    }
+    case Events::AmbientContextDetectEnded::Id: {
+        Events::AmbientContextDetectEnded::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+
+        __auto_type * value = [MTRAmbientContextSensingClusterAmbientContextDetectEndedEvent new];
+
+        do {
+            NSNumber * _Nonnull memberValue;
+            memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.startEventNumber];
+            value.startEventNumber = memberValue;
+        } while (0);
 
         return value;
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index c8c8ed6e617..d91dabb1027 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -892,6 +892,13 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSNumber * _Nullable epochStartTime1 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @property (nonatomic, copy) NSData * _Nullable epochKey2 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @property (nonatomic, copy) NSNumber * _Nullable epochStartTime2 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull groupKeyMulticastPolicy MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRGroupKeyManagementClusterGroupcastAdoptionStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull groupcastAdopted MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
 @end
 
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@@ -2002,8 +2009,6 @@ MTR_PROVISIONALLY_AVAILABLE
 @interface MTRAmbientContextSensingClusterAmbientContextTypeStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSArray * _Nonnull ambientContextSensed MTR_PROVISIONALLY_AVAILABLE;
 @property (nonatomic, copy) NSNumber * _Nullable detectionStartTime MTR_PROVISIONALLY_AVAILABLE;
-@property (nonatomic, copy) NSNumber * _Nullable objectCountThreshold MTR_PROVISIONALLY_AVAILABLE;
-@property (nonatomic, copy) NSNumber * _Nullable objectCount MTR_PROVISIONALLY_AVAILABLE;
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
@@ -2013,6 +2018,12 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy) NSNumber * _Nonnull holdTimeDefault MTR_PROVISIONALLY_AVAILABLE;
 @end
 
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRAmbientContextSensingClusterObjectCountConfigStruct : NSObject <NSCopying>
+@property (nonatomic, copy) MTRDataTypeSemanticTagStruct * _Nonnull countingObject MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull objectCountThreshold MTR_PROVISIONALLY_AVAILABLE;
+@end
+
 MTR_PROVISIONALLY_AVAILABLE
 @interface MTRAmbientContextSensingClusterPredictedActivityStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull startTimestamp MTR_PROVISIONALLY_AVAILABLE;
@@ -2024,8 +2035,14 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRAmbientContextSensingClusterAmbientContextDetectedEvent : NSObject <NSCopying>
-@property (nonatomic, copy) NSArray * _Nonnull ambientContextType MTR_PROVISIONALLY_AVAILABLE;
+@interface MTRAmbientContextSensingClusterAmbientContextDetectStartedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSArray * _Nullable ambientContextType MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable objectCount MTR_PROVISIONALLY_AVAILABLE;
+@end
+
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRAmbientContextSensingClusterAmbientContextDetectEndedEvent : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull startEventNumber MTR_PROVISIONALLY_AVAILABLE;
 @end
 
 MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 020720d6fab..a6fb89675e8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -3337,6 +3337,8 @@ - (instancetype)init
         _epochKey2 = nil;
 
         _epochStartTime2 = nil;
+
+        _groupKeyMulticastPolicy = @(0);
     }
     return self;
 }
@@ -3353,13 +3355,44 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
     other.epochStartTime1 = self.epochStartTime1;
     other.epochKey2 = self.epochKey2;
     other.epochStartTime2 = self.epochStartTime2;
+    other.groupKeyMulticastPolicy = self.groupKeyMulticastPolicy;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupKeySetID:%@; groupKeySecurityPolicy:%@; epochKey0:%@; epochStartTime0:%@; epochKey1:%@; epochStartTime1:%@; epochKey2:%@; epochStartTime2:%@; groupKeyMulticastPolicy:%@; >", NSStringFromClass([self class]), _groupKeySetID, _groupKeySecurityPolicy, [_epochKey0 base64EncodedStringWithOptions:0], _epochStartTime0, [_epochKey1 base64EncodedStringWithOptions:0], _epochStartTime1, [_epochKey2 base64EncodedStringWithOptions:0], _epochStartTime2, _groupKeyMulticastPolicy];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRGroupKeyManagementClusterGroupcastAdoptionStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _groupcastAdopted = @(0);
+
+        _fabricIndex = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRGroupKeyManagementClusterGroupcastAdoptionStruct alloc] init];
+
+    other.groupcastAdopted = self.groupcastAdopted;
+    other.fabricIndex = self.fabricIndex;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupKeySetID:%@; groupKeySecurityPolicy:%@; epochKey0:%@; epochStartTime0:%@; epochKey1:%@; epochStartTime1:%@; epochKey2:%@; epochStartTime2:%@; >", NSStringFromClass([self class]), _groupKeySetID, _groupKeySecurityPolicy, [_epochKey0 base64EncodedStringWithOptions:0], _epochStartTime0, [_epochKey1 base64EncodedStringWithOptions:0], _epochStartTime1, [_epochKey2 base64EncodedStringWithOptions:0], _epochStartTime2];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupcastAdopted:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _groupcastAdopted, _fabricIndex];
     return descriptionString;
 }
 
@@ -8573,10 +8606,6 @@ - (instancetype)init
         _ambientContextSensed = [NSArray array];
 
         _detectionStartTime = nil;
-
-        _objectCountThreshold = nil;
-
-        _objectCount = nil;
     }
     return self;
 }
@@ -8587,15 +8616,13 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
 
     other.ambientContextSensed = self.ambientContextSensed;
     other.detectionStartTime = self.detectionStartTime;
-    other.objectCountThreshold = self.objectCountThreshold;
-    other.objectCount = self.objectCount;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ambientContextSensed:%@; detectionStartTime:%@; objectCountThreshold:%@; objectCount:%@; >", NSStringFromClass([self class]), _ambientContextSensed, _detectionStartTime, _objectCountThreshold, _objectCount];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ambientContextSensed:%@; detectionStartTime:%@; >", NSStringFromClass([self class]), _ambientContextSensed, _detectionStartTime];
     return descriptionString;
 }
 
@@ -8634,6 +8661,36 @@ - (NSString *)description
 
 @end
 
+@implementation MTRAmbientContextSensingClusterObjectCountConfigStruct
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _countingObject = [MTRDataTypeSemanticTagStruct new];
+
+        _objectCountThreshold = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRAmbientContextSensingClusterObjectCountConfigStruct alloc] init];
+
+    other.countingObject = self.countingObject;
+    other.objectCountThreshold = self.objectCountThreshold;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: countingObject:%@; objectCountThreshold:%@; >", NSStringFromClass([self class]), _countingObject, _objectCountThreshold];
+    return descriptionString;
+}
+
+@end
+
 @implementation MTRAmbientContextSensingClusterPredictedActivityStruct
 - (instancetype)init
 {
@@ -8676,28 +8733,58 @@ - (NSString *)description
 
 @end
 
-@implementation MTRAmbientContextSensingClusterAmbientContextDetectedEvent
+@implementation MTRAmbientContextSensingClusterAmbientContextDetectStartedEvent
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _ambientContextType = [NSArray array];
+        _ambientContextType = nil;
+
+        _objectCount = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRAmbientContextSensingClusterAmbientContextDetectedEvent alloc] init];
+    auto other = [[MTRAmbientContextSensingClusterAmbientContextDetectStartedEvent alloc] init];
 
     other.ambientContextType = self.ambientContextType;
+    other.objectCount = self.objectCount;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ambientContextType:%@; objectCount:%@; >", NSStringFromClass([self class]), _ambientContextType, _objectCount];
+    return descriptionString;
+}
+
+@end
+
+@implementation MTRAmbientContextSensingClusterAmbientContextDetectEndedEvent
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _startEventNumber = @(0);
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone
+{
+    auto other = [[MTRAmbientContextSensingClusterAmbientContextDetectEndedEvent alloc] init];
+
+    other.startEventNumber = self.startEventNumber;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ambientContextType:%@; >", NSStringFromClass([self class]), _ambientContextType];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: startEventNumber:%@; >", NSStringFromClass([self class]), _startEventNumber];
     return descriptionString;
 }
 
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
index 984413398f0..1cfc707caea 100644
--- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -6308,6 +6308,72 @@ - (void)test049_CorrectTimeOnDevice
     }
 }
 
+// Tests that time synchronization loss is detected even when the cached CurrentTime
+// value has not changed (i.e. when the device power-cycles repeatedly and always
+// reports null, matching what we already have in cache from the previous cycle).
+- (void)test049b_TimeSyncLossDetectedWhenCacheUnchanged
+{
+    dispatch_queue_t queue = dispatch_get_main_queue();
+
+    __auto_type * device = [MTRDevice deviceWithNodeID:kDeviceId1 deviceController:sController];
+    __auto_type * delegate = [[MTRDeviceTestDelegateWithSubscriptionSetupOverride alloc] init];
+    delegate.skipSetupSubscription = YES;
+    delegate.forceTimeSynchronizationLossDetectionCadenceToZero = YES;
+
+    [device setDelegate:delegate queue:queue];
+
+    // Build a null CurrentTime report (UTCTime = null means the device has no time).
+    NSArray * nullTimeSyncReport = @[ @{
+        MTRAttributePathKey : [MTRAttributePath attributePathWithEndpointID:@(0)
+                                                                  clusterID:@(MTRClusterIDTypeTimeSynchronizationID)
+                                                                attributeID:@(MTRAttributeIDTypeClusterTimeSynchronizationAttributeUTCTimeID)],
+        MTRDataKey : @ {
+            MTRTypeKey : MTRNullValueType,
+        }
+    } ];
+
+    // Step 1: First injection primes the cache with null CurrentTime and should
+    // detect time sync loss (null UTCTime => device has no time).
+    XCTestExpectation * firstLossDetected = [self expectationWithDescription:@"First time sync loss detected"];
+    XCTestExpectation * firstReportEnd = [self expectationWithDescription:@"First report end"];
+    delegate.onTimeSynchronizationLossDetected = ^{
+        [firstLossDetected fulfill];
+    };
+    delegate.onReportEnd = ^{
+        [firstReportEnd fulfill];
+    };
+    [device unitTestInjectAttributeReport:nullTimeSyncReport fromSubscription:YES];
+    [self waitForExpectations:@[ firstLossDetected, firstReportEnd ] timeout:kTimeoutInSeconds];
+
+    // Step 2: Reset the detection callback and inject the same null report again.
+    // The cache still holds null from step 1, so readCacheValueChanged == NO.
+    // The fix ensures we still detect the time sync loss unconditionally.
+    XCTestExpectation * secondLossDetected = [self expectationWithDescription:@"Second time sync loss detected (cache unchanged)"];
+    XCTestExpectation * secondReportEnd = [self expectationWithDescription:@"Second report end"];
+    delegate.onTimeSynchronizationLossDetected = ^{
+        [secondLossDetected fulfill];
+    };
+    delegate.onReportEnd = ^{
+        [secondReportEnd fulfill];
+    };
+    [device unitTestInjectAttributeReport:nullTimeSyncReport fromSubscription:YES];
+    [self waitForExpectations:@[ secondLossDetected, secondReportEnd ] timeout:kTimeoutInSeconds];
+
+    // Step 3: Verify that a non-subscription injection does NOT trigger detection.
+    XCTestExpectation * nonSubscriptionReportEnd = [self expectationWithDescription:@"Non-subscription report end"];
+    XCTestExpectation * noLossFromRead = [self expectationWithDescription:@"No time sync loss from non-subscription report"];
+    noLossFromRead.inverted = YES;
+    delegate.onTimeSynchronizationLossDetected = ^{
+        [noLossFromRead fulfill];
+    };
+    delegate.onReportEnd = ^{
+        [nonSubscriptionReportEnd fulfill];
+    };
+    [device unitTestInjectAttributeReport:nullTimeSyncReport fromSubscription:NO];
+    [self waitForExpectations:@[ nonSubscriptionReportEnd ] timeout:kTimeoutInSeconds];
+    [self waitForExpectations:@[ noLossFromRead ] timeout:2];
+}
+
 - (void)test050_readAttributePaths_withWildCardPath
 {
     __auto_type * device = [MTRDevice deviceWithNodeID:kDeviceId1 deviceController:sController];
diff --git a/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.h
index 136cd05134f..0e3eb713481 100644
--- a/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.h
+++ b/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.h
@@ -42,6 +42,7 @@ typedef void (^MTRDeviceTestDelegateHandler)(NSError * error);
 @property (atomic, copy, nullable) dispatch_block_t onSubscriptionReset;
 @property (atomic, nullable) NSNumber * subscriptionMaxIntervalOverride;
 @property (atomic, copy, nullable) MTRDeviceTestDelegateHandler onUTCTimeSet;
+@property (atomic, copy, nullable) dispatch_block_t onTimeSynchronizationLossDetected;
 @property (atomic) BOOL forceTimeUpdateShortDelayToZero;
 @property (atomic) BOOL forceTimeSynchronizationLossDetectionCadenceToZero;
 @end
diff --git a/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.m
index 95b4fc21108..6ab7c33e3e0 100644
--- a/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.m
+++ b/src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.m
@@ -161,6 +161,13 @@ - (BOOL)unitTestTimeSynchronizationLossDetectionCadenceIsZero:(MTRDevice *)devic
     return self.forceTimeSynchronizationLossDetectionCadenceToZero;
 }
 
+- (void)unitTestTimeSynchronizationLossDetectedForDevice:(MTRDevice *)device
+{
+    if (self.onTimeSynchronizationLossDetected != nil) {
+        self.onTimeSynchronizationLossDetected();
+    }
+}
+
 @end
 
 @implementation MTRDeviceTestDelegateWithSubscriptionSetupOverride
diff --git a/src/darwin/Framework/Configs/Matter.xcconfig b/src/darwin/Framework/Configs/Matter.xcconfig
index 2a9fd3956d3..06dc4be800b 100644
--- a/src/darwin/Framework/Configs/Matter.xcconfig
+++ b/src/darwin/Framework/Configs/Matter.xcconfig
@@ -6,6 +6,7 @@ DYLIB_INSTALL_NAME_BASE = @rpath
 INFOPLIST_FILE = CHIP/Info.plist
 INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
 MODULEMAP_FILE = CHIP/Matter.modulemap
+MODULEMAP_PRIVATE_FILE = CHIP/Matter_Private.modulemap
 PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter
 PRODUCT_NAME = $(TARGET_NAME)
 SWIFT_INSTALL_OBJC_HEADER = NO
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index 3c9975722ea..6f44063e401 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -413,6 +413,7 @@
 		9B5CCB5D2C6EC890009DD99B /* MTRDevice_XPC.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5CCB5A2C6EC890009DD99B /* MTRDevice_XPC.h */; };
 		9B5CCB602C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9B5CCB5F2C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.mm */; };
 		9B5CCB612C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5CCB5E2C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.h */; };
+		9B985B4D2F3E876700CCC1D7 /* Matter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B985B4B2F3E876700CCC1D7 /* Matter_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		9BC9E5872D3099FF00784A21 /* MTRSwiftCertificateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BC9E5862D3099FF00784A21 /* MTRSwiftCertificateTests.swift */; };
 		9BD2142A2F21653B0044946F /* MTRBaseClusters_Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BD214292F21653B0044946F /* MTRBaseClusters_Private.mm */; };
 		9BD2142B2F21653B0044946F /* MTRBaseClusters_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD214282F21653B0044946F /* MTRBaseClusters_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1049,6 +1050,8 @@
 		9B5CCB5B2C6EC890009DD99B /* MTRDevice_XPC.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDevice_XPC.mm; sourceTree = "<group>"; };
 		9B5CCB5E2C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerXPCParameters.h; sourceTree = "<group>"; };
 		9B5CCB5F2C6EE29E009DD99B /* MTRDeviceControllerXPCParameters.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDeviceControllerXPCParameters.mm; sourceTree = "<group>"; };
+		9B985B4B2F3E876700CCC1D7 /* Matter_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Matter_Private.h; sourceTree = "<group>"; };
+		9B985B4C2F3E876700CCC1D7 /* Matter_Private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Matter_Private.modulemap; sourceTree = "<group>"; };
 		9BC9E5862D3099FF00784A21 /* MTRSwiftCertificateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MTRSwiftCertificateTests.swift; sourceTree = "<group>"; };
 		9BD214282F21653B0044946F /* MTRBaseClusters_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRBaseClusters_Private.h; sourceTree = "<group>"; };
 		9BD214292F21653B0044946F /* MTRBaseClusters_Private.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRBaseClusters_Private.mm; sourceTree = "<group>"; };
@@ -1787,6 +1790,8 @@
 		B202528F2459E34F00F97062 /* CHIP */ = {
 			isa = PBXGroup;
 			children = (
+				9B985B4B2F3E876700CCC1D7 /* Matter_Private.h */,
+				9B985B4C2F3E876700CCC1D7 /* Matter_Private.modulemap */,
 				7CD490112D378CF4007F9145 /* Matter.modulemap */,
 				CF3B63CB2CA31E71003C1C87 /* MTROTAImageTransferHandler.h */,
 				CF3B63CD2CA31E71003C1C87 /* MTROTAImageTransferHandler.mm */,
@@ -2345,6 +2350,7 @@
 				9BD2142B2F21653B0044946F /* MTRBaseClusters_Private.h in Headers */,
 				3D4733B32BE2D1DA003DC19B /* MTRUtilities.h in Headers */,
 				B2E0D7B1245B0B5C003C5B48 /* Matter.h in Headers */,
+				9B985B4D2F3E876700CCC1D7 /* Matter_Private.h in Headers */,
 				7596A84428762729004DAE0E /* MTRDevice.h in Headers */,
 				B2E0D7B8245B0B5C003C5B48 /* MTRSetupPayload.h in Headers */,
 				514A98AF2CD98C5E000EF4FD /* MTRAttributeValueWaiter.h in Headers */,
diff --git a/src/data-model-providers/codedriven/CodeDrivenDataModelProvider.cpp b/src/data-model-providers/codedriven/CodeDrivenDataModelProvider.cpp
index b4e3ba0dab0..928db1479f8 100644
--- a/src/data-model-providers/codedriven/CodeDrivenDataModelProvider.cpp
+++ b/src/data-model-providers/codedriven/CodeDrivenDataModelProvider.cpp
@@ -58,6 +58,11 @@ CHIP_ERROR CodeDrivenDataModelProvider::Startup(DataModel::InteractionModelConte
 
         if (endpointRegistered)
         {
+            // IMPORTANT: Clusters persist across Stop() → Start() cycles. When Stop() is called,
+            // Shutdown() clears cluster state (mContext) but doesn't destroy the cluster objects.
+            // When Start() is called again, we reach here with clusters that may already be initialized.
+            // DefaultServerCluster::Startup() is now idempotent - it detects if already initialized
+            // and just updates the context pointer without re-randomizing mDataVersion.
             if (cluster->Startup(*mServerClusterContext) != CHIP_NO_ERROR)
             {
                 had_failure = true;
@@ -77,20 +82,24 @@ CHIP_ERROR CodeDrivenDataModelProvider::Shutdown()
 {
     bool had_failure = false;
 
-    // Remove all endpoints. This will trigger Shutdown() on associated clusters.
-    while (mEndpointInterfaceRegistry.begin() != mEndpointInterfaceRegistry.end())
+    // Call Shutdown() on all clusters to clear their state (sets mContext = nullptr).
+    // IMPORTANT: Do NOT unregister clusters from the registry. Cluster objects persist
+    // across Stop() → Start() cycles along with their LazyRegisteredServerCluster wrappers.
+    // Only their runtime state is cleared here. This allows Start() to re-initialize
+    // the same cluster objects without destroying/recreating them (preserves mDataVersion).
+    ChipLogDetail(DataManagement, "CodeDrivenDataModelProvider::Shutdown() clearing cluster state (clusters remain registered)");
+
+    for (auto * cluster : mServerClusterRegistry.AllServerClusterInstances())
     {
-        if (RemoveEndpoint(mEndpointInterfaceRegistry.begin()->GetEndpointEntry().id) != CHIP_NO_ERROR)
-        {
-            had_failure = true;
-        }
+        cluster->Shutdown(ClusterShutdownType::kClusterShutdown);
     }
 
-    // Now we're safe to clean up the cluster registry.
-    while (mServerClusterRegistry.AllServerClusterInstances().begin() != mServerClusterRegistry.AllServerClusterInstances().end())
+    // Remove all endpoints from mEndpointInterfaceRegistry - but don't remove clusters from mServerClusterRegistry
+    while (mEndpointInterfaceRegistry.begin() != mEndpointInterfaceRegistry.end())
     {
-        ServerClusterInterface * clusterToRemove = *mServerClusterRegistry.AllServerClusterInstances().begin();
-        if (mServerClusterRegistry.Unregister(clusterToRemove) != CHIP_NO_ERROR)
+        EndpointId endpointToRemove = mEndpointInterfaceRegistry.begin()->GetEndpointEntry().id;
+        // Unregister the endpoint but don't shutdown clusters (already done above)
+        if (mEndpointInterfaceRegistry.Unregister(endpointToRemove) != CHIP_NO_ERROR)
         {
             had_failure = true;
         }
diff --git a/src/data-model-providers/codedriven/tests/TestCodeDrivenDataModelProvider.cpp b/src/data-model-providers/codedriven/tests/TestCodeDrivenDataModelProvider.cpp
index a9985dfdee4..6adfcf412af 100644
--- a/src/data-model-providers/codedriven/tests/TestCodeDrivenDataModelProvider.cpp
+++ b/src/data-model-providers/codedriven/tests/TestCodeDrivenDataModelProvider.cpp
@@ -192,7 +192,11 @@ class MockServerCluster : public DefaultServerCluster
 
     void Shutdown(ClusterShutdownType shutdownType) override
     {
-        shutdownCallCount++;
+        // Respect idempotent shutdown - only count first shutdown
+        if (!mIsShutdown)
+        {
+            shutdownCallCount++;
+        }
         DefaultServerCluster::Shutdown(shutdownType);
     }
 
diff --git a/src/inet/IPAddress.h b/src/inet/IPAddress.h
index d0e0684ea68..19624f33050 100644
--- a/src/inet/IPAddress.h
+++ b/src/inet/IPAddress.h
@@ -54,7 +54,7 @@
 #if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
 #include <openthread/icmp6.h>
 #include <openthread/ip6.h>
-#if CHIP_DEVICE_LAYER_TARGET_NRFCONNECT
+#if CHIP_DEVICE_LAYER_TARGET_NRFCONNECT || CHIP_DEVICE_LAYER_TARGET_ZEPHYR
 // Currently to use openthread endpoint in nRFConnect, we must fetch defines from zephyr's net
 // OpenThread header. It will be removed once the Zephyr version is updated to 4.2.0.
 #include <zephyr/net/openthread.h>
diff --git a/src/lib/BUILD.gn b/src/lib/BUILD.gn
index 0e4054e0ca1..a1afb42b97a 100644
--- a/src/lib/BUILD.gn
+++ b/src/lib/BUILD.gn
@@ -18,7 +18,9 @@ import("lib.gni")
 
 source_set("without-logging") {
   public_deps = [
+    # keep-sorted: start
     "${chip_root}/src/app",
+    "${chip_root}/src/app/clusters:clusters",
     "${chip_root}/src/ble",
     "${chip_root}/src/crypto",
     "${chip_root}/src/inet",
@@ -33,6 +35,8 @@ source_set("without-logging") {
     "${chip_root}/src/setup_payload:onboarding-codes-utils",
     "${chip_root}/src/system",
     "${chip_root}/src/transport",
+
+    # keep-sorted: end
   ]
 
   if (chip_device_config_enable_wifipaf) {
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index 085c206e8b5..20e1d857512 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -1107,6 +1107,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  * @brief Defines the number of "endpoint->controlling group" mappings per fabric.
  *
  * Binds to number of GroupMapping entries per fabric
+ * TODO cleanup this config #43166
  */
 #ifndef CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC
 #define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 1
@@ -1121,12 +1122,22 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_MAX_BINDING_ENTRIES_PER_FABRIC 4
 #endif
 
+/**
+ * @def CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT
+ *
+ * @brief Defines the maximum number of group memberships
+ */
+#ifndef CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT
+#define CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT 10
+#endif // CHIP_CONFIG_MAX_GROUPCAST_MEMBERSHIP_COUNT
+
 /**
  * @def CHIP_CONFIG_MAX_GROUPS_PER_FABRIC
  *
  * @brief Defines the number of groups supported per fabric, see Group Key Management Cluster in specification.
  *
  * Binds to number of GroupState entries to support per fabric
+ * TODO cleanup this config #43166
  */
 #ifndef CHIP_CONFIG_MAX_GROUPS_PER_FABRIC
 #define CHIP_CONFIG_MAX_GROUPS_PER_FABRIC (4 * CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC)
@@ -1144,7 +1155,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  * Binds to number of KeySet entries to support per fabric (Need at least 1 for Identity Protection Key)
  */
 #ifndef CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC
-#define CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC 3
+#define CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC (3 + 1) // support 3 KeySets + IPK per fabric
 #endif
 
 #if CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC < 1
diff --git a/src/lib/core/TLVReader.cpp b/src/lib/core/TLVReader.cpp
index ca3da3b555b..443bd578ab8 100644
--- a/src/lib/core/TLVReader.cpp
+++ b/src/lib/core/TLVReader.cpp
@@ -331,6 +331,7 @@ CHIP_ERROR TLVReader::Get(CharSpan & v) const
     if (bytes == nullptr)
     {
         // Calling memchr further down with bytes == nullptr would have undefined behaviour, exiting early.
+        v = {}; // empty data
         return CHIP_NO_ERROR;
     }
 
@@ -377,6 +378,7 @@ CHIP_ERROR TLVReader::Get(Optional<LocalizedStringIdentifier> & lsid)
     if (bytes == nullptr)
     {
         // Calling memchr further down with bytes == nullptr would have undefined behaviour, exiting early.
+        // This treats null/empty LSID as a NullOptional (we clear the value at the start)
         return CHIP_NO_ERROR;
     }
 
@@ -385,6 +387,7 @@ CHIP_ERROR TLVReader::Get(Optional<LocalizedStringIdentifier> & lsid)
     const uint8_t * infoSeparator1 = static_cast<const uint8_t *>(memchr(bytes, kUnicodeInformationSeparator1, len));
     if (infoSeparator1 == nullptr)
     {
+        // This treats null/empty LSID as a NullOptional (we clear the value at the start)
         return CHIP_NO_ERROR;
     }
 
@@ -398,6 +401,7 @@ CHIP_ERROR TLVReader::Get(Optional<LocalizedStringIdentifier> & lsid)
     }
     if (len == 0)
     {
+        // This treats null/empty LSID as a NullOptional (we clear the value at the start)
         return CHIP_NO_ERROR;
     }
     VerifyOrReturnError(len <= kMaxLocalizedStringIdentifierLen, CHIP_ERROR_INVALID_TLV_ELEMENT);
diff --git a/src/lib/core/tests/TestTLV.cpp b/src/lib/core/tests/TestTLV.cpp
index 43995382611..ef470177a6b 100644
--- a/src/lib/core/tests/TestTLV.cpp
+++ b/src/lib/core/tests/TestTLV.cpp
@@ -2815,9 +2815,16 @@ TEST_F(TestTLV, CheckTLVCharSpan)
         {  "This is a test case #3" IS1_CHAR,                                    "This is a test case #3"  },
         {  "Thé" IS1_CHAR,                                                       "Thé"                     },
         {  IS1_CHAR " abc " IS1_CHAR " def",                                     ""                        },
+        {"", ""},
+        {"Post empty", "Post empty"},
+        {"", ""},
     };
     // clang-format on
 
+    // Important: declared in the outer scope to ensure that each read correctly
+    // resets the values.
+    chip::CharSpan readerSpan;
+
     for (auto & testCase : sCharSpanTestCases)
     {
         uint8_t backingStore[100];
@@ -2837,12 +2844,11 @@ TEST_F(TestTLV, CheckTLVCharSpan)
         err = reader.Next();
         EXPECT_EQ(err, CHIP_NO_ERROR);
 
-        chip::CharSpan readerSpan;
         err = reader.Get(readerSpan);
-        EXPECT_EQ(err, CHIP_NO_ERROR);
+        ASSERT_EQ(err, CHIP_NO_ERROR);
 
         EXPECT_EQ(strlen(testCase.expectedString), readerSpan.size());
-        EXPECT_EQ(memcmp(readerSpan.data(), testCase.expectedString, strlen(testCase.expectedString)), 0);
+        EXPECT_TRUE(readerSpan.data_equal(CharSpan::fromCharString(testCase.expectedString)));
     }
 }
 
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index fb8cc2a979c..cbd4f457c11 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -464,7 +464,7 @@ void DiscoveryImplPlatform::HandleDnssdInit(void * context, CHIP_ERROR initError
     }
     else
     {
-        ChipLogFailure(initError, Discovery, "DNS-SD initialization failed with");
+        ChipLogError(Discovery, "DNS-SD initialization failed with: %" CHIP_ERROR_FORMAT, initError.Format());
         publisher->mState = State::kUninitialized;
     }
 }
diff --git a/src/lib/dnssd/minimal_mdns/core/QNameString.h b/src/lib/dnssd/minimal_mdns/core/QNameString.h
index 0c57954dd5d..d01763ed5e3 100644
--- a/src/lib/dnssd/minimal_mdns/core/QNameString.h
+++ b/src/lib/dnssd/minimal_mdns/core/QNameString.h
@@ -45,12 +45,18 @@ class QNameString
 private:
     bool EndsWith(const char * aSuffix, size_t aLength) const
     {
+        if (!Fit())
+        {
+            return false;
+        }
+
         const char * buffer = mBuffer.c_str();
         size_t bufferLength = strlen(buffer);
         if (bufferLength < aLength)
         {
             return false;
         }
+
         return memcmp(buffer + bufferLength - aLength, aSuffix, aLength) == 0;
     }
 
diff --git a/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp b/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp
index a3d9a39b067..eace2f5a1b6 100644
--- a/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp
+++ b/src/lib/dnssd/minimal_mdns/core/tests/TestQNameString.cpp
@@ -64,4 +64,17 @@ TEST_F(TestQNameString, EndsWith)
     EXPECT_FALSE(qName.EndsWith("test"));
     EXPECT_FALSE(qName.EndsWith("abc.test"));
 }
+
+TEST_F(TestQNameString, LongQName)
+{
+    const testing::TestQName<10> kLong({ "label1234567890", "label1234567890", "label1234567890", "label1234567890",
+                                         "label1234567890", "label1234567890", "label1234567890", "label1234567890",
+                                         "label1234567890", "label1234567890" });
+    QNameString qName(kLong.Serialized());
+
+    // QNameString buffer is 128 bytes. 10 * 15 + 9 = 159 bytes.
+    EXPECT_FALSE(qName.Fit());
+    // EndsWith should return false if Fit() is false, even if the suffix matches what's in the buffer
+    EXPECT_FALSE(qName.EndsWith("label1234567890"));
+}
 } // namespace
diff --git a/src/lib/shell/MainLoopBouffalolab.cpp b/src/lib/shell/MainLoopBouffalolab.cpp
index 098f3809cc8..974f72ebecf 100644
--- a/src/lib/shell/MainLoopBouffalolab.cpp
+++ b/src/lib/shell/MainLoopBouffalolab.cpp
@@ -26,7 +26,7 @@ using chip::Shell::Engine;
 
 void cmd_matter(size_t argc, char ** argv)
 {
-    Engine::Root().ExecCommand(argc - 1, argv + 1);
+    TEMPORARY_RETURN_IGNORED Engine::Root().ExecCommand(argc - 1, argv + 1);
 }
 
 SHELL_CMD_EXPORT_ALIAS(cmd_matter, matter, matter command);
diff --git a/src/lib/support/AutoRelease.h b/src/lib/support/AutoRelease.h
index 8bdde81c8d3..af28dd2f2db 100644
--- a/src/lib/support/AutoRelease.h
+++ b/src/lib/support/AutoRelease.h
@@ -36,7 +36,7 @@ class AutoRelease
 {
 public:
     AutoRelease(Releasable * releasable) : mReleasable(releasable) {}
-    ~AutoRelease() { Release(); }
+    __attribute__((always_inline)) inline ~AutoRelease() { Release(); }
 
     // Not copyable
     AutoRelease(const AutoRelease &)             = delete;
@@ -62,7 +62,7 @@ class AutoRelease
     inline operator bool() { return mReleasable != nullptr; }
     inline bool IsNull() const { return mReleasable == nullptr; }
 
-    void Release()
+    __attribute__((always_inline)) inline void Release()
     {
         VerifyOrReturn(mReleasable != nullptr);
         mReleasable->Release();
diff --git a/src/lib/support/LambdaBridge.h b/src/lib/support/LambdaBridge.h
index 390dc694803..2f87283d50b 100644
--- a/src/lib/support/LambdaBridge.h
+++ b/src/lib/support/LambdaBridge.h
@@ -43,7 +43,10 @@ class LambdaBridge
     void operator()() const { mLambdaProxy(mLambdaBody); }
 
 private:
-    using LambdaStorage = std::aligned_storage_t<CHIP_CONFIG_LAMBDA_EVENT_SIZE, CHIP_CONFIG_LAMBDA_EVENT_ALIGN>;
+    struct LambdaStorage
+    {
+        alignas(CHIP_CONFIG_LAMBDA_EVENT_ALIGN) unsigned char data[CHIP_CONFIG_LAMBDA_EVENT_SIZE];
+    };
     void (*mLambdaProxy)(const LambdaStorage & body);
     LambdaStorage mLambdaBody;
 };
diff --git a/src/lib/support/Variant.h b/src/lib/support/Variant.h
index a95e8dca062..e747ed3a964 100644
--- a/src/lib/support/Variant.h
+++ b/src/lib/support/Variant.h
@@ -139,7 +139,10 @@ struct Variant
     static constexpr std::size_t kDataAlign   = std::max({ alignof(Ts)... });
     static constexpr std::size_t kInvalidType = SIZE_MAX;
 
-    using Data  = typename std::aligned_storage<kDataSize, kDataAlign>::type;
+    struct Data
+    {
+        alignas(kDataAlign) unsigned char data[kDataSize];
+    };
     using Curry = VariantInternal::VariantCurry<0, Ts...>;
 
     std::size_t mTypeId;
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 96c0fecb2d5..ac4c1160e07 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -15,6 +15,9 @@
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/build/chip/buildconfig_header.gni")
+import("${chip_root}/build/chip/tests.gni")
+import("${chip_root}/src/controller/flags.gni")
+import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/system/system.gni")
 
 import("device.gni")
@@ -150,10 +153,17 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       "CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER=${chip_use_transitional_device_instance_info_provider}",
       "CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG=${chip_device_config_enable_dynamic_mrp_config}",
       "CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF=${chip_device_config_enable_wifipaf}",
-      "CHIP_DEVICE_CONFIG_ENABLE_JOINT_FABRIC=${chip_device_config_enable_joint_fabric}",
       "CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP=${chip_device_config_enable_thread_meshcop}",
     ]
 
+    _enable_joint_fabric = chip_device_config_enable_joint_fabric
+    if (chip_build_tests &&
+        (chip_device_platform == "linux" || chip_device_platform == "darwin")) {
+      _enable_joint_fabric = true
+    }
+    defines +=
+        [ "CHIP_DEVICE_CONFIG_ENABLE_JOINT_FABRIC=${_enable_joint_fabric}" ]
+
     public_deps = [ "${chip_root}/src/app/icd/server:icd-server-config" ]
 
     if (chip_device_platform == "linux" || chip_device_platform == "darwin" ||
@@ -175,6 +185,15 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       "CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR=${chip_enable_ota_requestor}",
     ]
 
+    # TODO : Currently OpenThread Commissioner is only supported in linux, need to add support for more platform
+    if (chip_device_platform == "linux" && chip_crypto != "mbedtls" &&
+        chip_support_thread_meshcop && current_os == host_os &&
+        current_cpu == host_cpu) {
+      defines += [ "CHIP_SUPPORT_THREAD_MESHCOP=1" ]
+    } else {
+      defines += [ "CHIP_SUPPORT_THREAD_MESHCOP=0" ]
+    }
+
     if (chip_enable_nfc_based_commissioning) {
       defines += [ "CHIP_DEVICE_CONFIG_ENABLE_NFC_BASED_COMMISSIONING=1" ]
     }
diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp
index a265d14dbc1..ef2ec250024 100644
--- a/src/platform/ESP32/ConfigurationManagerImpl.cpp
+++ b/src/platform/ESP32/ConfigurationManagerImpl.cpp
@@ -373,7 +373,7 @@ bool ConfigurationManagerImpl::CanFactoryReset()
 
 void ConfigurationManagerImpl::InitiateFactoryReset()
 {
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DoFactoryReset);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DoFactoryReset));
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value)
diff --git a/src/platform/ESP32/ConnectivityManagerImpl.cpp b/src/platform/ESP32/ConnectivityManagerImpl.cpp
index 3be612c776f..afaac121749 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl.cpp
@@ -62,10 +62,10 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>::_Init();
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    TEMPORARY_RETURN_IGNORED InitWiFi();
+    ReturnErrorOnFailure(InitWiFi());
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-    TEMPORARY_RETURN_IGNORED InitEthernet();
+    ReturnErrorOnFailure(InitEthernet());
 #endif
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
index a2184a9d383..7ea61e49e49 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
@@ -71,18 +71,14 @@ bool ConnectivityManagerImpl::_IsWiFiStationEnabled(void)
 
 CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(WiFiStationMode val)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    VerifyOrExit(val != kWiFiStationMode_NotSupported, err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(val != kWiFiStationMode_NotSupported, CHIP_ERROR_INVALID_ARGUMENT);
 
     if (val != kWiFiStationMode_ApplicationControlled)
     {
         /* Remain consistent with the previous logic to enable STA mode here.
            TODO: Set STA mode according to `val`. */
-        err = Internal::ESP32Utils::EnableStationMode();
-        SuccessOrExit(err);
-
-        TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+        ReturnErrorOnFailure(Internal::ESP32Utils::EnableStationMode());
+        ReturnErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL));
     }
 
     if (mWiFiStationMode != val)
@@ -93,8 +89,7 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(WiFiStationMode val)
 
     mWiFiStationMode = val;
 
-exit:
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 bool ConnectivityManagerImpl::_IsWiFiStationProvisioned(void)
@@ -112,7 +107,7 @@ void ConnectivityManagerImpl::_ClearWiFiStationProvision(void)
             ChipLogError(DeviceLayer, "ClearWiFiStationProvision failed: %" CHIP_ERROR_FORMAT, error.Format());
             return;
         }
-        TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+        LogErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL));
     }
 }
 
@@ -408,7 +403,7 @@ void ConnectivityManagerImpl::OnWiFiPlatformEvent(const ChipDeviceEvent * event)
                 break;
             case WIFI_EVENT_STA_DISCONNECTED:
                 ChipLogProgress(DeviceLayer, "WIFI_EVENT_STA_DISCONNECTED");
-                TEMPORARY_RETURN_IGNORED NetworkCommissioning::ESPWiFiDriver::GetInstance().SetLastDisconnectReason(event);
+                LogErrorOnFailure(NetworkCommissioning::ESPWiFiDriver::GetInstance().SetLastDisconnectReason(event));
                 if (mWiFiStationState == kWiFiStationState_Connecting)
                 {
                     ChangeWiFiStationState(kWiFiStationState_Connecting_Failed);
@@ -455,13 +450,13 @@ void ConnectivityManagerImpl::_OnWiFiScanDone()
 {
     // Schedule a call to DriveStationState method in case a station connect attempt was
     // deferred because the scan was in progress.
-    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+    LogErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL));
 }
 
 void ConnectivityManagerImpl::_OnWiFiStationProvisionChange()
 {
     // Schedule a call to the DriveStationState method to adjust the station state as needed.
-    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+    LogErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL));
 }
 
 void ConnectivityManagerImpl::DriveStationState()
diff --git a/src/platform/ESP32/KeyValueStoreManagerImpl.cpp b/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
index a2d9ef80712..6c99538a55e 100644
--- a/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
@@ -52,10 +52,10 @@ bool HashIfLongKey(const char * key, char * keyHash)
     VerifyOrReturnError(strlen(key) >= NVS_KEY_NAME_MAX_SIZE, false);
 
     uint8_t hashBuffer[chip::Crypto::kSHA1_Hash_Length];
-    VerifyOrReturnError(Crypto::Hash_SHA1(Uint8::from_const_char(key), strlen(key), hashBuffer) == CHIP_NO_ERROR, false);
+    ReturnValueOnFailure(Crypto::Hash_SHA1(Uint8::from_const_char(key), strlen(key), hashBuffer), false);
 
     BitFlags<Encoding::HexFlags> flags(Encoding::HexFlags::kNone);
-    TEMPORARY_RETURN_IGNORED Encoding::BytesToHex(hashBuffer, NVS_KEY_NAME_MAX_SIZE / 2, keyHash, NVS_KEY_NAME_MAX_SIZE, flags);
+    ReturnValueOnFailure(Encoding::BytesToHex(hashBuffer, NVS_KEY_NAME_MAX_SIZE / 2, keyHash, NVS_KEY_NAME_MAX_SIZE, flags), false);
     keyHash[NVS_KEY_NAME_MAX_SIZE - 1] = 0;
 
     ChipLogDetail(DeviceLayer, "Using hash:%s for nvs key:%s", keyHash, StringOrNullMarker(key));
diff --git a/src/platform/ESP32/NetworkCommissioningDriver.cpp b/src/platform/ESP32/NetworkCommissioningDriver.cpp
index f12923f26fd..d67c8eed27d 100644
--- a/src/platform/ESP32/NetworkCommissioningDriver.cpp
+++ b/src/platform/ESP32/NetworkCommissioningDriver.cpp
@@ -117,9 +117,7 @@ CHIP_ERROR ESPWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChange
     // If the network configuration backup exists, it means that the device has been rebooted with
     // the fail-safe armed. Since ESP-WiFi persists all wifi credentials changes, the backup must
     // be restored on the boot. If there's no backup, the below function is a no-op.
-    TEMPORARY_RETURN_IGNORED RevertConfiguration();
-
-    return CHIP_NO_ERROR;
+    return RevertConfiguration();
 }
 
 void ESPWiFiDriver::Shutdown()
diff --git a/src/platform/ESP32/PlatformManagerImpl.cpp b/src/platform/ESP32/PlatformManagerImpl.cpp
index 0fe17c396c7..f95c8a379e6 100644
--- a/src/platform/ESP32/PlatformManagerImpl.cpp
+++ b/src/platform/ESP32/PlatformManagerImpl.cpp
@@ -86,7 +86,7 @@ void PlatformManagerImpl::_Shutdown()
 
     if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
     {
-        TEMPORARY_RETURN_IGNORED ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours);
+        LogErrorOnFailure(ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours));
     }
     else
     {
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index bf7ce4885dd..82b53e759a2 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -203,15 +203,12 @@ void BLEManagerImpl::ConnectDevice(const ble_addr_t & addr, uint16_t timeout)
 
 CHIP_ERROR BLEManagerImpl::_Init()
 {
-    CHIP_ERROR err;
-
     // Initialize the Chip BleLayer.
 #ifdef CONFIG_ENABLE_ESP32_BLE_CONTROLLER
-    err = BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer());
+    ReturnErrorOnFailure(BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer()));
 #else
-    err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
+    ReturnErrorOnFailure(BleLayer::Init(this, this, &DeviceLayer::SystemLayer()));
 #endif
-    SuccessOrExit(err);
 
     mRXCharAttrHandle = 0;
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
@@ -231,10 +228,7 @@ CHIP_ERROR BLEManagerImpl::_Init()
     mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
     memset(mDeviceName, 0, sizeof(mDeviceName));
 
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
-
-exit:
-    return err;
+    return PlatformMgr().ScheduleWork(DriveBLEState, 0);
 }
 
 void BLEManagerImpl::_Shutdown()
@@ -253,14 +247,13 @@ void BLEManagerImpl::_Shutdown()
     mFlags.ClearAll().Set(Flags::kGATTServiceStarted);
     mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Disabled;
 
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DriveBLEState, 0));
 }
 
 CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    VerifyOrExit(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported, err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
+    VerifyOrReturnError(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported,
+                        CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
 
     if (val)
     {
@@ -270,10 +263,7 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
     mFlags.Set(Flags::kFastAdvertisingEnabled, val);
     mFlags.Set(Flags::kAdvertisingRefreshNeeded, 1);
     mFlags.Set(Flags::kAdvertisingEnabled, val);
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
-
-exit:
-    return err;
+    return PlatformMgr().ScheduleWork(DriveBLEState, 0);
 }
 
 void BLEManagerImpl::BleAdvTimeoutHandler(System::Layer *, void *)
@@ -299,7 +289,7 @@ void BLEManagerImpl::BleAdvTimeoutHandler(System::Layer *, void *)
         BLEMgrImpl().mFlags.Set(Flags::kAdvertisingRefreshNeeded, 1);
     }
 #endif
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DriveBLEState, 0));
 }
 
 CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
@@ -316,8 +306,7 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
     mFlags.Set(Flags::kAdvertisingRefreshNeeded);
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
-    return CHIP_NO_ERROR;
+    return PlatformMgr().ScheduleWork(DriveBLEState, 0);
 }
 
 CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
@@ -332,9 +321,8 @@ CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
 
 CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * deviceName)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    VerifyOrExit(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported, err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
+    VerifyOrReturnError(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported,
+                        CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
     if (deviceName != NULL && deviceName[0] != 0)
     {
         if (strlen(deviceName) >= kMaxDeviceNameLength)
@@ -350,8 +338,7 @@ CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * deviceName)
         mFlags.Clear(Flags::kUseCustomDeviceName);
     }
 
-exit:
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
@@ -405,7 +392,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
 #ifdef CONFIG_ENABLE_ESP32_BLE_CONTROLLER
 void BLEManagerImpl::HandlePlatformSpecificBLEEvent(const ChipDeviceEvent * apEvent)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
     ChipLogProgress(DeviceLayer, "HandlePlatformSpecificBLEEvent %d", apEvent->Type);
 
     switch (apEvent->Type)
@@ -449,11 +435,8 @@ void BLEManagerImpl::HandlePlatformSpecificBLEEvent(const ChipDeviceEvent * apEv
         break;
     }
 
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Disabling CHIPoBLE service due to error: %" CHIP_ERROR_FORMAT, err.Format());
-        mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Disabled;
-    }
+    mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Disabled;
+    return;
 }
 
 static int OnUnsubscribeCharComplete(uint16_t conn_handle, const struct ble_gatt_error * error, struct ble_gatt_attr * attr,
@@ -582,7 +565,7 @@ CHIP_ERROR BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
     // Force a refresh of the advertising state.
     mFlags.Set(Flags::kAdvertisingRefreshNeeded);
     mFlags.Clear(Flags::kAdvertisingConfigured);
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DriveBLEState, 0));
 #endif
 
     return err;
@@ -684,7 +667,7 @@ CHIP_ERROR BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const C
 void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
 {
     ChipLogDetail(Ble, "Received notification of closed CHIPoBLE connection (con %u)", conId);
-    TEMPORARY_RETURN_IGNORED CloseConnection(conId);
+    LogErrorOnFailure(CloseConnection(conId));
 }
 
 CHIP_ERROR BLEManagerImpl::MapBLEError(int bleErr)
@@ -1037,7 +1020,7 @@ void BLEManagerImpl::ClaimBLEMemory(System::Layer *, void *)
 
         // Rescheduling it for later, 2 seconds is an arbitrary value, keeping it a bit more so that
         // we dont have to reschedule it again
-        TEMPORARY_RETURN_IGNORED SystemLayer().StartTimer(System::Clock::Seconds32(2), ClaimBLEMemory, nullptr);
+        LogErrorOnFailure(SystemLayer().StartTimer(System::Clock::Seconds32(2), ClaimBLEMemory, nullptr));
     }
     else
     {
@@ -1900,7 +1883,7 @@ int BLEManagerImpl::ble_svr_gap_event(struct ble_gap_event * event, void * arg)
     }
 
     // Schedule DriveBLEState() to run.
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DriveBLEState, 0));
 
     return err.AsInteger();
 }
@@ -2010,7 +1993,7 @@ int BLEManagerImpl::gatt_svr_chr_access(uint16_t conn_handle, uint16_t attr_hand
         break;
     }
 
-    TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
+    LogErrorOnFailure(PlatformMgr().ScheduleWork(DriveBLEState, 0));
 
     return err;
 }
diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
index 448459d6962..20a01b64150 100644
--- a/src/platform/Linux/CHIPLinuxStorage.h
+++ b/src/platform/Linux/CHIPLinuxStorage.h
@@ -49,15 +49,23 @@
 #define LOCALSTATEDIR "/tmp"
 #endif
 
+#ifndef CHIP_DEFAULT_FACTORY_PATH
 #define CHIP_DEFAULT_FACTORY_PATH                                                                                                  \
     FATCONFDIR "/"                                                                                                                 \
                "chip_factory.ini"
+#endif // CHIP_DEFAULT_FACTORY_PATH
+
+#ifndef CHIP_DEFAULT_CONFIG_PATH
 #define CHIP_DEFAULT_CONFIG_PATH                                                                                                   \
     SYSCONFDIR "/"                                                                                                                 \
                "chip_config.ini"
+#endif // CHIP_DEFAULT_CONFIG_PATH
+
+#ifndef CHIP_DEFAULT_DATA_PATH
 #define CHIP_DEFAULT_DATA_PATH                                                                                                     \
     LOCALSTATEDIR "/"                                                                                                              \
                   "chip_counters.ini"
+#endif // CHIP_DEFAULT_DATA_PATH
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
index b4b6cb79181..f8dbe33e3ae 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -970,8 +970,10 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::SendRendezvousAnnounce
         mRendezvousRetransmissionCount++;
         if (mRendezvousRetransmissionCount < kMaxRendezvousRetransmissions)
         {
+            const uint32_t kRendezvousRetransmissionIntervalMs = 1250;
             ChipLogProgress(DeviceLayer, "Try the current Thread network #%u", mRendezvousRetransmissionCount);
-            DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds32(1250), _HandleRendezvousRetransmissionTimer, this);
+            DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds32(kRendezvousRetransmissionIntervalMs),
+                                                  _HandleRendezvousRetransmissionTimer, this);
         }
         else
         {
diff --git a/src/platform/Tizen/BLEManagerImpl.cpp b/src/platform/Tizen/BLEManagerImpl.cpp
index c3504c1336d..5768522fc23 100644
--- a/src/platform/Tizen/BLEManagerImpl.cpp
+++ b/src/platform/Tizen/BLEManagerImpl.cpp
@@ -379,7 +379,7 @@ void BLEManagerImpl::NotifyBLEDisconnection(BLE_CONNECTION_OBJECT conId)
 
 void BLEManagerImpl::NotifyHandleConnectFailed(CHIP_ERROR error)
 {
-    ChipLogProgress(DeviceLayer, "Connection failed: %" CHIP_ERROR_FORMAT, error.Format());
+    ChipLogError(DeviceLayer, "Connection failed: %" CHIP_ERROR_FORMAT, error.Format());
     if (mIsCentral)
     {
         ChipDeviceEvent event{ .Type     = DeviceEventType::kPlatformTizenBLECentralConnectFailed,
@@ -420,26 +420,16 @@ void BLEManagerImpl::HandleConnectionTimeout(System::Layer *, void * appState)
 
 CHIP_ERROR BLEManagerImpl::ConnectChipThing(const char * address)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    int ret;
-
     ChipLogProgress(DeviceLayer, "ConnectRequest: Addr [%s]", StringOrNullMarker(address));
 
-    ret = bt_gatt_client_create(address, &mGattClient);
-    VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "Failed to create GATT client: %s", get_error_message(ret));
-                 err = MATTER_PLATFORM_ERROR(ret));
+    int ret = bt_gatt_client_create(address, &mGattClient);
+    VerifyOrReturnError(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret), NotifyHandleConnectFailed(MATTER_PLATFORM_ERROR(ret)));
 
     ret = bt_gatt_connect(address, false);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "Failed to issue GATT connect request: %s", get_error_message(ret));
-                 err = MATTER_PLATFORM_ERROR(ret));
+    VerifyOrReturnError(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret), NotifyHandleConnectFailed(MATTER_PLATFORM_ERROR(ret)));
 
     ChipLogProgress(DeviceLayer, "GATT Connect Issued");
-
-exit:
-    if (err != CHIP_NO_ERROR)
-        NotifyHandleConnectFailed(err);
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 void BLEManagerImpl::OnDeviceScanned(const bt_adapter_le_device_scan_result_info_s & scanInfo,
@@ -509,8 +499,8 @@ void BLEManagerImpl::OnScanComplete()
 
 void BLEManagerImpl::OnScanError(CHIP_ERROR err)
 {
+    ChipLogError(Ble, "BLE scan error: %" CHIP_ERROR_FORMAT, err.Format());
     BleConnectionDelegate::OnConnectionError(mBLEScanConfig.mAppState, err);
-    ChipLogDetail(Ble, "BLE scan error: %" CHIP_ERROR_FORMAT, err.Format());
 }
 
 CHIP_ERROR BLEManagerImpl::RegisterGATTServer()
@@ -707,16 +697,11 @@ CHIP_ERROR BLEManagerImpl::StopBLEAdvertising()
     ChipLogProgress(DeviceLayer, "Stop Advertising");
 
     int ret = bt_adapter_le_stop_advertising(mAdvertiser);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "bt_adapter_le_stop_advertising() failed: %s", get_error_message(ret)));
+    VerifyOrReturnError(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret),
+                        NotifyBLEPeripheralAdvStopComplete(MATTER_PLATFORM_ERROR(ret)));
 
     mAdvReqInProgress = true;
     return CHIP_NO_ERROR;
-
-exit:
-    auto err = MATTER_PLATFORM_ERROR(ret);
-    NotifyBLEPeripheralAdvStopComplete(err);
-    return err;
 }
 
 static bool __GattClientForeachCharCb(int total, int index, bt_gatt_h charHandle, void * data)
@@ -948,26 +933,18 @@ void BLEManagerImpl::DriveBLEState()
 
 CHIP_ERROR BLEManagerImpl::_Init()
 {
-    CHIP_ERROR err;
-
-    err = BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer());
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer()));
 
     mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
     mFlags.Set(Flags::kFastAdvertisingEnabled, true);
 
     ChipLogProgress(DeviceLayer, "Initialize Tizen BLE Layer");
 
-    err = PlatformMgrImpl().GLibMatterContextInvokeSync(
-        +[](BLEManagerImpl * self) { return self->_InitImpl(); }, this);
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(PlatformMgrImpl().GLibMatterContextInvokeSync(
+        +[](BLEManagerImpl * self) { return self->_InitImpl(); }, this));
 
     mFlags.Set(Flags::kTizenBLELayerInitialized);
-
-    err = DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
-
-exit:
-    return err;
+    return DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
 }
 
 void BLEManagerImpl::_Shutdown()
@@ -1286,11 +1263,11 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
     /* Send StartScan Request to Scanner Class */
     strcpy(data.service_uuid, Ble::CHIP_BLE_SERVICE_SHORT_UUID_STR);
     err = mDeviceScanner.StartScan(ScanFilterType::kServiceData, data);
-    SuccessOrExitAction(err, ChipLogFailure(err, Ble, "Failed to start BLE scan"));
+    SuccessOrExitAction(err, ChipLogError(Ble, "Failed to start BLE scan: %" CHIP_ERROR_FORMAT, err.Format()));
 
     err = DeviceLayer::SystemLayer().StartTimer(kNewConnectionScanTimeout, HandleScanTimeout, this);
     SuccessOrExitAction(err, TEMPORARY_RETURN_IGNORED mDeviceScanner.StopScan();
-                        ChipLogFailure(err, Ble, "Failed to start BLE scan timeout"));
+                        ChipLogError(Ble, "Failed to start BLE scan timeout: %" CHIP_ERROR_FORMAT, err.Format()));
 
     mBLEScanConfig.mBleScanState = scanType;
     return;
diff --git a/src/platform/Tizen/ChipDeviceScanner.cpp b/src/platform/Tizen/ChipDeviceScanner.cpp
index f86dd71e7d9..d4522f05dc0 100644
--- a/src/platform/Tizen/ChipDeviceScanner.cpp
+++ b/src/platform/Tizen/ChipDeviceScanner.cpp
@@ -104,8 +104,7 @@ CHIP_ERROR ChipDeviceScanner::StartScanImpl()
             return reinterpret_cast<ChipDeviceScanner *>(self)->LeScanResultCb(result, scanInfo);
         },
         this);
-    VerifyOrReturnValue(ret == BT_ERROR_NONE, CHIP_ERROR_INTERNAL,
-                        ChipLogError(DeviceLayer, "bt_adapter_le_start_scan() failed: %s", get_error_message(ret)));
+    VerifyOrReturnValue(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret));
     mIsScanning = true;
     return CHIP_NO_ERROR;
 }
@@ -119,45 +118,34 @@ static bool __IsScanFilterSupported()
     return is_supported;
 }
 
-int ChipDeviceScanner::SetupScanFilter(ScanFilterType filterType, const ScanFilterData & filterData)
+CHIP_ERROR ChipDeviceScanner::SetupScanFilter(ScanFilterType filterType, const ScanFilterData & filterData)
 {
-    VerifyOrReturnValue(__IsScanFilterSupported(), BT_ERROR_NONE, ChipLogError(DeviceLayer, "BLE scan filter not supported"));
+    VerifyOrReturnError(__IsScanFilterSupported(), MATTER_PLATFORM_ERROR(BT_ERROR_NOT_SUPPORTED));
 
-    int ret = CreateLEScanFilter(filterType);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "BLE scan filter creation failed: %s. Do Normal Scan", get_error_message(ret)));
-
-    ret = RegisterScanFilter(filterType, filterData);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "BLE scan filter registration failed: %s. Do Normal Scan", get_error_message(ret)));
-
-    return ret;
+    int ret = bt_adapter_le_scan_filter_create(&mScanFilter);
+    VerifyOrReturnError(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret));
 
-exit:
-    UnRegisterScanFilter();
-    return ret;
+    ReturnErrorOnFailure(RegisterScanFilter(filterType, filterData), UnRegisterScanFilter());
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ChipDeviceScanner::StartScan(ScanFilterType filterType, const ScanFilterData & filterData)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
     VerifyOrReturnError(!mIsScanning, CHIP_ERROR_INCORRECT_STATE);
 
-    // Scan Filter Setup if supported: silently bypass error & do filterless scan in case of error
-    SetupScanFilter(filterType, filterData);
+    // Setup scan filter if supported. Otherwise, do filterless scan.
+    CHIP_ERROR err = SetupScanFilter(filterType, filterData);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Failed to set up scan filter: %" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogProgress(DeviceLayer, "Proceeding with filterless scan");
+    }
 
-    // All set to trigger LE Scan
     err = PlatformMgrImpl().GLibMatterContextInvokeSync(
         +[](ChipDeviceScanner * self) { return self->StartScanImpl(); }, this);
-    SuccessOrExit(err);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, err, TEMPORARY_RETURN_IGNORED StopScan());
 
     return CHIP_NO_ERROR;
-
-exit:
-    ChipLogError(DeviceLayer, "Start CHIP Scan could not succeed fully! Stop Scan...");
-    TEMPORARY_RETURN_IGNORED StopScan();
-    UnRegisterScanFilter();
-    return err;
 }
 
 CHIP_ERROR ChipDeviceScanner::StopScan()
@@ -188,60 +176,49 @@ void ChipDeviceScanner::UnRegisterScanFilter()
     if (mScanFilter)
     {
         bt_adapter_le_scan_filter_unregister(mScanFilter);
+        bt_adapter_le_scan_filter_destroy(mScanFilter);
         mScanFilter = nullptr;
     }
 }
 
-int ChipDeviceScanner::RegisterScanFilter(ScanFilterType filterType, const ScanFilterData & filterData)
+CHIP_ERROR ChipDeviceScanner::RegisterScanFilter(ScanFilterType filterType, const ScanFilterData & filterData)
 {
-    int ret = BT_ERROR_NONE;
+    int ret;
 
     switch (filterType)
     {
-    case ScanFilterType::kAddress: {
+    case ScanFilterType::kAddress:
         ChipLogProgress(DeviceLayer, "Register BLE scan filter: Address");
         ret = bt_adapter_le_scan_filter_set_device_address(mScanFilter, filterData.address);
-        VerifyOrExit(
-            ret == BT_ERROR_NONE,
+        VerifyOrReturnError(
+            ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret),
             ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_set_device_address() failed: %s", get_error_message(ret)));
         break;
-    }
-    case ScanFilterType::kServiceUUID: {
+    case ScanFilterType::kServiceUUID:
         ChipLogProgress(DeviceLayer, "Register BLE scan filter: Service UUID");
         ret = bt_adapter_le_scan_filter_set_service_uuid(mScanFilter, filterData.service_uuid);
-        VerifyOrExit(ret == BT_ERROR_NONE,
-                     ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_set_service_uuid() failed: %s", get_error_message(ret)));
+        VerifyOrReturnError(
+            ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret),
+            ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_set_service_uuid() failed: %s", get_error_message(ret)));
         break;
-    }
-    case ScanFilterType::kServiceData: {
+    case ScanFilterType::kServiceData:
         ChipLogProgress(DeviceLayer, "Register BLE scan filter: Service Data");
         ret = bt_adapter_le_scan_filter_set_service_data(mScanFilter, filterData.service_uuid, filterData.service_data,
                                                          filterData.service_data_len);
-        VerifyOrExit(ret == BT_ERROR_NONE,
-                     ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_set_service_data() failed: %s", get_error_message(ret)));
+        VerifyOrReturnError(
+            ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret),
+            ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_set_service_data() failed: %s", get_error_message(ret)));
         break;
-    }
     case ScanFilterType::kNoFilter:
     default:
-        goto exit;
+        return CHIP_NO_ERROR;
     }
 
     ret = bt_adapter_le_scan_filter_register(mScanFilter);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_register() failed: %s", get_error_message(ret)));
+    VerifyOrReturnError(ret == BT_ERROR_NONE, MATTER_PLATFORM_ERROR(ret),
+                        ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_register() failed: %s", get_error_message(ret)));
 
-exit:
-    return ret;
-}
-
-int ChipDeviceScanner::CreateLEScanFilter(ScanFilterType filterType)
-{
-    int ret = bt_adapter_le_scan_filter_create(&mScanFilter);
-    VerifyOrExit(ret == BT_ERROR_NONE,
-                 ChipLogError(DeviceLayer, "bt_adapter_le_scan_filter_create() failed: %s", get_error_message(ret)));
-    ChipLogProgress(DeviceLayer, "BLE scan filter created successfully");
-exit:
-    return ret;
+    return CHIP_NO_ERROR;
 }
 
 } // namespace Internal
diff --git a/src/platform/Tizen/ChipDeviceScanner.h b/src/platform/Tizen/ChipDeviceScanner.h
index 04d1a86fc81..8d13d1b9c53 100644
--- a/src/platform/Tizen/ChipDeviceScanner.h
+++ b/src/platform/Tizen/ChipDeviceScanner.h
@@ -92,9 +92,8 @@ class ChipDeviceScanner
     void LeScanResultCb(int result, bt_adapter_le_device_scan_result_info_s * scanInfo);
     CHIP_ERROR StartScanImpl();
 
-    int CreateLEScanFilter(ScanFilterType filterType);
-    int RegisterScanFilter(ScanFilterType filterType, const ScanFilterData & filterData);
-    int SetupScanFilter(ScanFilterType filterType, const ScanFilterData & filterData);
+    CHIP_ERROR RegisterScanFilter(ScanFilterType filterType, const ScanFilterData & filterData);
+    CHIP_ERROR SetupScanFilter(ScanFilterType filterType, const ScanFilterData & filterData);
     void UnRegisterScanFilter();
 
     ChipDeviceScannerDelegate * mDelegate;
diff --git a/src/platform/Zephyr/ConnectivityManagerImpl.cpp b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
index d13a4cebc4e..82bd1c422ac 100644
--- a/src/platform/Zephyr/ConnectivityManagerImpl.cpp
+++ b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
@@ -17,7 +17,14 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+#include <inet/UDPEndPointImplOpenThread.h>
+#endif
+
+#if CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
 #include <inet/UDPEndPointImplSockets.h>
+#endif
+
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/ConnectivityManager.h>
@@ -50,6 +57,7 @@ namespace chip {
 namespace DeviceLayer {
 
 namespace {
+#if CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
 CHIP_ERROR JoinLeaveMulticastGroup(net_if * iface, const Inet::IPAddress & address,
                                    UDPEndPointImplSockets::MulticastOperation operation)
 {
@@ -93,6 +101,7 @@ CHIP_ERROR JoinLeaveMulticastGroup(net_if * iface, const Inet::IPAddress & addre
 
     return CHIP_NO_ERROR;
 }
+#endif // CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
 } // namespace
 
 ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
@@ -107,6 +116,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD || CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+#if CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
     UDPEndPointImplSockets::SetMulticastGroupHandler(
         [](InterfaceId interfaceId, const IPAddress & address, UDPEndPointImplSockets::MulticastOperation operation) {
             if (interfaceId.IsPresent())
@@ -125,6 +135,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 
             return CHIP_NO_ERROR;
         });
+#endif // CHIP_SYSTEM_CONFIG_USE_PLATFORM_MULTICAST_API
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD || CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     return CHIP_NO_ERROR;
diff --git a/src/platform/Zephyr/Logging.cpp b/src/platform/Zephyr/Logging.cpp
index 4f7322534e3..0777bfa5da2 100644
--- a/src/platform/Zephyr/Logging.cpp
+++ b/src/platform/Zephyr/Logging.cpp
@@ -41,7 +41,8 @@ namespace Platform {
 /**
  * CHIP log output function.
  */
-
+// Suppress "stack usage might be unbounded" warning triggered by CONFIG_LOG_MODE_DEFERRED
+#pragma GCC diagnostic ignored "-Wstack-usage="
 void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char * msg, va_list v)
 {
     char formattedMsg[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
diff --git a/src/platform/Zephyr/SystemPlatformConfig.h b/src/platform/Zephyr/SystemPlatformConfig.h
index 42a96d857eb..4766e2fa00e 100644
--- a/src/platform/Zephyr/SystemPlatformConfig.h
+++ b/src/platform/Zephyr/SystemPlatformConfig.h
@@ -45,7 +45,11 @@ struct ChipDeviceEvent;
 #endif // CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
 
 #define CHIP_SYSTEM_CONFIG_USE_LWIP 0
+#ifdef CONFIG_CHIP_USE_OT_ENDPOINT
+#define CHIP_SYSTEM_CONFIG_USE_SOCKETS 0
+#else
 #define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
+#endif // CONFIG_CHIP_USE_OT_ENDPOINT
 
 #ifndef CHIP_SYSTEM_CONFIG_THREAD_LOCAL_STORAGE
 #ifdef CONFIG_CHIP_SYSTEM_THREAD_LOCAL_STORAGE
diff --git a/src/platform/bouffalolab/BL602/BUILD.gn b/src/platform/bouffalolab/BL602/BUILD.gn
index 416314435bc..3a59dfc8c69 100644
--- a/src/platform/bouffalolab/BL602/BUILD.gn
+++ b/src/platform/bouffalolab/BL602/BUILD.gn
@@ -57,9 +57,9 @@ static_library("BL602") {
   }
 
   if (bouffalo_sdk_component_easyflash_enabled) {
-    sources += [ "../common/BLConfig.cpp" ]
+    sources += [ "../common/BflbConfig.cpp" ]
   } else {
-    sources += [ "../common/BLConfig_littlefs.cpp" ]
+    sources += [ "../common/BflbConfig_littlefs.cpp" ]
   }
 
   deps = [
diff --git a/src/platform/bouffalolab/BL602/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/BL602/ConnectivityManagerImpl.cpp
index 25ae917a75b..baa9cfe3e44 100644
--- a/src/platform/bouffalolab/BL602/ConnectivityManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL602/ConnectivityManagerImpl.cpp
@@ -15,12 +15,14 @@
  *    limitations under the License.
  */
 
-#include <platform/internal/CHIPDeviceLayerInternal.h>
+#include <bl60x_wifi_driver/wifi_mgmr.h>
 
-#include <NetworkCommissioningDriver.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <platform/DiagnosticDataProvider.h>
+
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 
 using namespace ::chip;
 
@@ -29,8 +31,8 @@ namespace DeviceLayer {
 
 void ConnectivityManagerImpl::OnWiFiStationDisconnected()
 {
-    NetworkCommissioning::BLWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
-    uint16_t reason = NetworkCommissioning::BLWiFiDriver::GetInstance().GetLastDisconnectReason();
+    TEMPORARY_RETURN_IGNORED NetworkCommissioning::BflbWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
+    uint16_t reason = NetworkCommissioning::BflbWiFiDriver::GetInstance().GetLastDisconnectReason();
     uint8_t associationFailureCause =
         chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown);
     WiFiDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetWiFiDiagnosticsDelegate();
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
index 90829afe3ef..a0d6ea24f54 100644
--- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
+++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
@@ -18,7 +18,11 @@
 #include <string.h>
 
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
+
+#include <lwip/ethip6.h>
+#include <lwip/tcpip.h>
+
 #include <wifi_mgmr_ext.h>
 #include <wifi_mgmr_portable.h>
 
@@ -29,16 +33,32 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 
-CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
+auto converter = [](const wifi_mgmr_ap_item_t & raw) -> WiFiScanResponse {
+    WiFiScanResponse item;
+
+    item.security.SetRaw(raw.auth);
+    item.ssidLen         = raw.ssid_len < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength ? raw.ssid_len
+                                                                                          : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength;
+    item.channel         = raw.channel;
+    item.wiFiBand        = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
+    item.signal.type     = WirelessSignalType::kdBm;
+    item.signal.strength = raw.rssi;
+    memcpy(item.ssid, raw.ssid, item.ssidLen);
+    memcpy(item.bssid, raw.bssid, 6);
+
+    return item;
+};
+
+CHIP_ERROR BflbWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     CHIP_ERROR err;
     size_t ssidLen        = 0;
     size_t credentialsLen = 0;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials,
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials,
                                                    sizeof(mSavedNetwork.credentials), &credentialsLen);
     SuccessOrExit(err);
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid),
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid),
                                                    &ssidLen);
     SuccessOrExit(err);
 
@@ -60,35 +80,35 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     return err;
 }
 
-void BLWiFiDriver::Shutdown()
+void BflbWiFiDriver::Shutdown()
 {
     mpStatusChangeCallback = nullptr;
 }
 
-CHIP_ERROR BLWiFiDriver::CommitConfiguration()
+CHIP_ERROR BflbWiFiDriver::CommitConfiguration()
 {
-    ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::CommitConfiguration");
+    ChipLogProgress(NetworkProvisioning, "BflbWiFiDriver::CommitConfiguration");
     ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
+        PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
                                                                   mStagingNetwork.credentialsLen));
     mSavedNetwork = mStagingNetwork;
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BLWiFiDriver::RevertConfiguration()
+CHIP_ERROR BflbWiFiDriver::RevertConfiguration()
 {
     mStagingNetwork = mSavedNetwork;
     return CHIP_NO_ERROR;
 }
 
-bool BLWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
+bool BflbWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
 {
     return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
 }
 
-Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
-                                        uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
+                                          uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -106,7 +126,7 @@ Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mut
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -118,7 +138,7 @@ Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebu
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
+Status BflbWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
 {
     outDebugText.reduce_size(0);
 
@@ -128,7 +148,7 @@ Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCh
     return Status::kSuccess;
 }
 
-CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
+CHIP_ERROR BflbWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
 {
     char wifi_ssid[64] = { 0 };
     char passwd[64]    = { 0 };
@@ -150,11 +170,11 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     // - 64 bytes: WPA/WPA2/WPA3 raw hex PSK
     // Note 10 hex WEP64 and 13 bytes / 26 hex WEP128 passphrase are covered by 8~63 bytes WPA passphrase, so we don't check WEP64
     // hex and WEP128 passphrase.
-    if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BLWiFiDriver::WiFiCredentialLength::kWEP64 ||
-        (keyLen >= BLWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BLWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
+    if (keyLen == BflbWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BflbWiFiDriver::WiFiCredentialLength::kWEP64 ||
+        (keyLen >= BflbWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BflbWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
     {
 
-        if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen)
+        if (keyLen == BflbWiFiDriver::WiFiCredentialLength::kOpen)
         {
             wifi_mgmr_sta_connect(&wifi_interface, wifi_ssid, NULL, NULL, NULL, 0, 0);
         }
@@ -171,7 +191,7 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     return CHIP_NO_ERROR;
 }
 
-void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
+void BflbWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
 {
     if (mpConnectCallback)
     {
@@ -187,7 +207,7 @@ void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
     }
 }
 
-void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
+void BflbWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
     Status networkingStatus = Status::kSuccess;
@@ -213,35 +233,18 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
+void BflbWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
 {
-    int iret = 0;
-
     if (callback != nullptr)
     {
-        if (!ssid.empty())
-        {
-            if (ssid.size() < sizeof(mScanSSID))
-            {
-                memset(mScanSSID, 0, sizeof(mScanSSID));
-                memcpy(mScanSSID, ssid.data(), ssid.size());
-                iret      = wifi_mgmr_scan_adv(NULL, NULL, NULL, 0, NULL, mScanSSID, 1, 0);
-                mScanType = 1;
-            }
-            else
-            {
-                iret = -1;
-            }
-        }
-        else
-        {
-            iret      = wifi_mgmr_scan(NULL, NULL);
-            mScanType = 0;
-        }
+        mpScanCallback  = nullptr;
+        mScanSSIDlength = 0;
 
-        if (0 == iret)
+        if (ssid.size() <= sizeof(mScanSSID) && 0 == wifi_mgmr_scan(nullptr, nullptr))
         {
-            mpScanCallback = callback;
+            memcpy(mScanSSID, ssid.data(), ssid.size());
+            mScanSSIDlength = ssid.size();
+            mpScanCallback  = callback;
         }
         else
         {
@@ -250,53 +253,46 @@ void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callba
     }
 }
 
-void BLWiFiDriver::OnScanWiFiNetworkDone()
+void BflbWiFiDriver::OnScanWiFiNetworkDone()
 {
-    int ap_num = 0;
+    int ap_num                        = 0;
+    wifi_mgmr_ap_item_t * pScanResult = nullptr;
 
     ap_num = wifi_mgmr_get_scan_ap_num();
-    if (!ap_num)
+    if (ap_num)
     {
-        ChipLogProgress(DeviceLayer, "No AP found");
-        if (mpScanCallback != nullptr)
+        if (mScanSSIDlength)
         {
-            mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
+            ap_num = 1;
         }
-        return;
+        pScanResult = (wifi_mgmr_ap_item_t *) pvPortMalloc(ap_num * sizeof(wifi_mgmr_ap_item_t));
     }
-
-    wifi_mgmr_ap_item_t * ScanResult = (wifi_mgmr_ap_item_t *) pvPortMalloc(ap_num * sizeof(wifi_mgmr_ap_item_t));
-    wifi_mgmr_get_scan_result(ScanResult, &ap_num, mScanType, mScanSSID);
-
-    if (ScanResult)
+    if (pScanResult)
     {
-        if (CHIP_NO_ERROR == DeviceLayer::SystemLayer().ScheduleLambda([ap_num, ScanResult]() {
-                BLScanResponseIterator iter(ap_num, ScanResult);
-                if (GetInstance().mpScanCallback)
-                {
-                    GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
-                    GetInstance().mpScanCallback = nullptr;
-                }
-                else
-                {
-                    ChipLogError(DeviceLayer, "can't find the ScanCallback function");
-                }
-            }))
-        {
-            vPortFree(ScanResult);
-            ChipLogProgress(DeviceLayer, "ScheduleLambda OK");
-        }
+        wifi_mgmr_get_scan_result(pScanResult, &ap_num, mScanSSIDlength, mScanSSID);
     }
     else
     {
-        ChipLogError(DeviceLayer, "can't get ap_records ");
-        if (mpScanCallback)
+        ap_num = 0;
+    }
+
+    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([ap_num, pScanResult]() {
+        if (GetInstance().mpScanCallback)
+        {
+            BflbScanResponseIterator iter(ap_num, pScanResult, converter);
+            GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
+        }
+        else
         {
-            mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
+            ChipLogError(DeviceLayer, "can't find the ScanCallback function");
         }
+    });
+
+    if (pScanResult)
+    {
+        vPortFree(pScanResult);
     }
+    mScanSSIDlength = 0;
 }
 
 CHIP_ERROR GetConfiguredNetwork(Network & network)
@@ -316,7 +312,7 @@ CHIP_ERROR GetConfiguredNetwork(Network & network)
     return CHIP_NO_ERROR;
 }
 
-void BLWiFiDriver::OnNetworkStatusChange()
+void BflbWiFiDriver::OnNetworkStatusChange()
 {
     Network configuredNetwork;
     bool staConnected = false;
@@ -345,7 +341,7 @@ void BLWiFiDriver::OnNetworkStatusChange()
         MakeOptional(GetLastDisconnectReason()));
 }
 
-CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
+CHIP_ERROR BflbWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
 {
     uint16_t status_code, reason_code;
 
@@ -355,17 +351,17 @@ CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
     return CHIP_NO_ERROR;
 }
 
-int32_t BLWiFiDriver::GetLastDisconnectReason()
+int32_t BflbWiFiDriver::GetLastDisconnectReason()
 {
     return mLastDisconnectedReason;
 }
 
-size_t BLWiFiDriver::WiFiNetworkIterator::Count()
+size_t BflbWiFiDriver::WiFiNetworkIterator::Count()
 {
     return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
 }
 
-bool BLWiFiDriver::WiFiNetworkIterator::Next(Network & item)
+bool BflbWiFiDriver::WiFiNetworkIterator::Next(Network & item)
 {
     if (mExhausted || mDriver->mStagingNetwork.ssidLen == 0)
     {
@@ -402,14 +398,14 @@ void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg)
     case kWiFiOnInitDone:
         break;
     case kWiFiOnScanDone:
-        BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
+        BflbWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
         break;
     case kWiFiOnConnecting:
         ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connecting);
         ConnectivityMgrImpl().OnConnectivityChanged(deviceInterface_getNetif());
         break;
     case kWiFiOnConnected:
-        BLWiFiDriver::GetInstance().OnNetworkStatusChange();
+        BflbWiFiDriver::GetInstance().OnNetworkStatusChange();
         break;
     case kGotIpAddress:
         ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManagerImpl::kWiFiStationState_Connected);
@@ -446,6 +442,8 @@ extern "C" void wifi_event_handler(uint32_t code)
     case CODE_WIFI_ON_INIT_DONE:
         wifi_mgmr_start_background(&conf);
         break;
+    case CODE_WIFI_ON_MGMR_DONE:
+        break;
     case CODE_WIFI_ON_SCAN_DONE:
         event.Type = kWiFiOnScanDone;
         PlatformMgr().PostEventOrDie(&event);
@@ -477,9 +475,16 @@ extern "C" void network_netif_ext_callback(struct netif * nif, netif_nsc_reason_
 
     memset(&event, 0, sizeof(ChipDeviceEvent));
 
-    if ((LWIP_NSC_IPV6_ADDR_STATE_CHANGED & reason) && args)
+    if ((LWIP_NSC_STATUS_CHANGED & reason) && args && !nif->ip6_autoconfig_enabled)
     {
+        nif->flags |= NETIF_FLAG_ETHERNET | NETIF_FLAG_MLD6;
+        nif->output_ip6 = ethip6_output;
+        netif_create_ip6_linklocal_address(nif, 1);
+        nif->ip6_autoconfig_enabled = 1;
+    }
 
+    if ((LWIP_NSC_IPV6_ADDR_STATE_CHANGED & reason) && args)
+    {
         if (args->ipv6_addr_state_changed.addr_index >= LWIP_IPV6_NUM_ADDRESSES ||
             ip6_addr_islinklocal(netif_ip6_addr(nif, args->ipv6_addr_state_changed.addr_index)))
         {
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
deleted file mode 100644
index bd2d3718f88..00000000000
--- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
+++ /dev/null
@@ -1,153 +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 <bl60x_wifi_driver/wifi_mgmr.h>
-#include <platform/NetworkCommissioning.h>
-
-namespace chip {
-namespace DeviceLayer {
-namespace NetworkCommissioning {
-
-void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg);
-
-namespace {
-inline constexpr uint8_t kMaxWiFiNetworks                  = 1;
-inline constexpr uint8_t kWiFiScanNetworksTimeOutSeconds   = 10;
-inline constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 20;
-} // namespace
-
-class BLScanResponseIterator : public Iterator<WiFiScanResponse>
-{
-public:
-    BLScanResponseIterator(const size_t size, const wifi_mgmr_ap_item_t * scanResults) : mSize(size), mpScanResults(scanResults) {}
-    size_t Count() override { return mSize; }
-    bool Next(WiFiScanResponse & item) override
-    {
-        if (mIternum >= mSize)
-        {
-            return false;
-        }
-
-        item.security.SetRaw(mpScanResults[mIternum].auth);
-        item.ssidLen         = mpScanResults[mIternum].ssid_len < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength
-                    ? mpScanResults[mIternum].ssid_len
-                    : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength;
-        item.channel         = mpScanResults[mIternum].channel;
-        item.wiFiBand        = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
-        item.signal.type     = NetworkCommissioning::WirelessSignalType::kdBm;
-        item.signal.strength = mpScanResults[mIternum].rssi;
-        memcpy(item.ssid, mpScanResults[mIternum].ssid, item.ssidLen);
-        memcpy(item.bssid, mpScanResults[mIternum].bssid, 6);
-
-        mIternum++;
-        return true;
-    }
-    void Release() override {}
-
-private:
-    const size_t mSize;
-    const wifi_mgmr_ap_item_t * mpScanResults;
-    size_t mIternum = 0;
-};
-
-class BLWiFiDriver final : public WiFiDriver
-{
-public:
-    class WiFiNetworkIterator final : public NetworkIterator
-    {
-    public:
-        WiFiNetworkIterator(BLWiFiDriver * aDriver) : mDriver(aDriver) {}
-        size_t Count() override;
-        bool Next(Network & item) override;
-        void Release() override { delete this; }
-        ~WiFiNetworkIterator() = default;
-
-    private:
-        BLWiFiDriver * mDriver;
-        bool mExhausted = false;
-    };
-
-    struct WiFiNetwork
-    {
-        char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength];
-        uint8_t ssidLen = 0;
-        char credentials[DeviceLayer::Internal::kMaxWiFiKeyLength];
-        uint8_t credentialsLen = 0;
-    };
-    enum WiFiCredentialLength
-    {
-        kOpen      = 0,
-        kWEP64     = 5,
-        kMinWPAPSK = 8,
-        kMaxWPAPSK = 63,
-        kWPAPSKHex = 64,
-    };
-
-    // BaseDriver
-    NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
-    CHIP_ERROR Init(NetworkStatusChangeCallback * networkStatusChangeCallback) override;
-    void Shutdown();
-
-    // WirelessDriver
-    uint8_t GetMaxNetworks() override { return kMaxWiFiNetworks; }
-    uint8_t GetScanNetworkTimeoutSeconds() override { return kWiFiScanNetworksTimeOutSeconds; }
-    uint8_t GetConnectNetworkTimeoutSeconds() override { return kWiFiConnectNetworkTimeoutSeconds; }
-
-    CHIP_ERROR CommitConfiguration() override;
-    CHIP_ERROR RevertConfiguration() override;
-
-    Status RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
-    Status ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText) override;
-    void ConnectNetwork(ByteSpan networkId, ConnectCallback * callback) override;
-
-    // WiFiDriver
-    Status AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
-                              uint8_t & outNetworkIndex) override;
-    void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override;
-
-    CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
-    void OnConnectWiFiNetwork(bool isConnected);
-    void OnScanWiFiNetworkDone();
-    void OnNetworkStatusChange();
-
-    CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
-    int32_t GetLastDisconnectReason();
-    static BLWiFiDriver & GetInstance()
-    {
-        static BLWiFiDriver instance;
-        return instance;
-    }
-
-private:
-    bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
-
-    WiFiNetwork mSavedNetwork;
-    WiFiNetwork mStagingNetwork;
-    ScanCallback * mpScanCallback;
-    ConnectCallback * mpConnectCallback;
-    NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
-    int32_t mLastDisconnectedReason;
-
-    /** +1 byte for string termination */
-    char mScanSSID[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1];
-    uint32_t mScanType;
-};
-
-} // namespace NetworkCommissioning
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
index ade4d468dff..f40aeb6a51e 100644
--- a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
@@ -18,12 +18,13 @@
 #include <crypto/CHIPCryptoPAL.h>
 #include <platform/FreeRTOS/SystemTimeSupport.h>
 #include <platform/PlatformManager.h>
-#include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <lwip/tcpip.h>
 
+#include <bl60x_wifi_driver/wifi_mgmr.h>
 #include <bl_sec.h>
 #include <wifi_mgmr_portable.h>
 
@@ -41,7 +42,6 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-    TaskHandle_t backup_eventLoopTask;
 
     // Initialize LwIP.
     tcpip_init(NULL, NULL);
@@ -51,11 +51,8 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
-    /** weiyin, backup mEventLoopTask which is reset in _InitChipStack */
-    backup_eventLoopTask = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask;
-    err                  = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
+    err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
-    Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask = backup_eventLoopTask;
 
     wifi_start_firmware_task();
 exit:
diff --git a/src/platform/bouffalolab/BL602/wifi_mgmr_portable.c b/src/platform/bouffalolab/BL602/wifi_mgmr_portable.c
index dd9c7a415a1..0dc1700b884 100644
--- a/src/platform/bouffalolab/BL602/wifi_mgmr_portable.c
+++ b/src/platform/bouffalolab/BL602/wifi_mgmr_portable.c
@@ -2,6 +2,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include <lwip/tcpip.h>
+
 #include <FreeRTOS.h>
 #include <aos/yloop.h>
 #include <bl60x_wifi_driver/wifi_mgmr.h>
@@ -17,6 +19,7 @@
 #include <wpa_supplicant/src/common/wpa_common.h>
 #include <wpa_supplicant/src/rsn_supp/wpa_i.h>
 
+#include <hal_wifi.h>
 #include <wifi_mgmr_portable.h>
 
 extern struct wpa_sm gWpaSm;
@@ -52,7 +55,7 @@ int wifi_mgmr_get_scan_ap_num(void)
     return count;
 }
 
-void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, uint8_t scan_type, char * ssid)
+void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, int ssid_len, char * ssid)
 {
     int i, count, iter;
 
@@ -63,9 +66,10 @@ void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, uint8_t
     {
         if (wifiMgmr.scan_items[i].is_used && (!wifi_mgmr_scan_item_is_timeout(&wifiMgmr, &wifiMgmr.scan_items[i])))
         {
-            if (scan_type)
+            if (ssid_len)
             {
-                if (memcmp(ssid, wifiMgmr.scan_items[i].ssid, wifiMgmr.scan_items[i].ssid_len) != 0)
+                if (wifiMgmr.scan_items[i].ssid_len != ssid_len ||
+                    memcmp(ssid, wifiMgmr.scan_items[i].ssid, wifiMgmr.scan_items[i].ssid_len) != 0)
                 {
                     continue;
                 }
@@ -85,31 +89,6 @@ void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, uint8_t
     *num = iter;
 }
 
-int wifi_mgmr_get_scan_result_filter(wifi_mgmr_ap_item_t * result, char * ssid)
-{
-    int i, count;
-
-    count = sizeof(wifiMgmr.scan_items) / sizeof(wifiMgmr.scan_items[0]);
-    for (i = 0; i < count; i++)
-    {
-        if (wifiMgmr.scan_items[i].is_used && (!wifi_mgmr_scan_item_is_timeout(&wifiMgmr, &wifiMgmr.scan_items[i])) &&
-            !strncmp(ssid, wifiMgmr.scan_items[i].ssid, wifiMgmr.scan_items[i].ssid_len))
-        {
-            memcpy(result->ssid, wifiMgmr.scan_items[i].ssid, wifiMgmr.scan_items[i].ssid_len);
-            result->ssid[wifiMgmr.scan_items[i].ssid_len] = 0;
-            result->ssid_tail[0]                          = 0;
-            result->ssid_len                              = wifiMgmr.scan_items[i].ssid_len;
-            memcpy(result->bssid, wifiMgmr.scan_items[i].bssid, 6);
-            result->channel = wifiMgmr.scan_items[i].channel;
-            result->auth    = wifiMgmr.scan_items[i].auth;
-            result->rssi    = wifiMgmr.scan_items[i].rssi;
-            return 0;
-        }
-    }
-
-    return -1;
-}
-
 int wifi_mgmr_profile_ssid_get(uint8_t * ssid)
 {
     wifi_mgmr_profile_msg_t profile_msg;
@@ -163,17 +142,19 @@ static void wifi_event_handler_raw(input_event_t * event, void * private_data)
     wifi_event_handler(event->code);
 }
 
-void wifi_start_firmware_task(void)
+err_t dhcp_server_stop(struct netif * netif)
 {
-#define WIFI_STACK_SIZE 1552
-    static StackType_t wifi_fw_stack[WIFI_STACK_SIZE];
-    static StaticTask_t wifi_fw_task;
+    return 0;
+}
+void dhcpd_start(struct netif * netif, int start, int limit) {}
 
-    aos_register_event_filter(EV_WIFI, wifi_event_handler_raw, NULL);
+void wifi_start_firmware_task(void)
+{
+    LOCK_TCPIP_CORE();
     netif_add_ext_callback(&netifExtCallback, network_netif_ext_callback);
+    UNLOCK_TCPIP_CORE();
 
-    bl_pm_init();
-    xTaskCreateStatic(wifi_main, (char *) "fw", WIFI_STACK_SIZE, NULL, 30, wifi_fw_stack, &wifi_fw_task);
-
+    aos_register_event_filter(EV_WIFI, wifi_event_handler_raw, NULL);
+    hal_wifi_start_firmware_task();
     aos_post_event(EV_WIFI, CODE_WIFI_ON_INIT_DONE, 0);
 }
diff --git a/src/platform/bouffalolab/BL602/wifi_mgmr_portable.h b/src/platform/bouffalolab/BL602/wifi_mgmr_portable.h
index f74f829a8ba..2cae3cc167b 100644
--- a/src/platform/bouffalolab/BL602/wifi_mgmr_portable.h
+++ b/src/platform/bouffalolab/BL602/wifi_mgmr_portable.h
@@ -10,7 +10,7 @@ int wifi_mgmr_get_bssid(uint8_t * bssid);
 void wifi_mgmr_conn_result_get(uint16_t * status_code, uint16_t * reason_code);
 int wifi_mgmr_profile_ssid_get(uint8_t * ssid);
 int wifi_mgmr_get_scan_ap_num(void);
-void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, uint8_t scan_type, char * ssid);
+void wifi_mgmr_get_scan_result(wifi_mgmr_ap_item_t * result, int * num, int scan_type, char * ssid);
 
 bool wifi_mgmr_security_type_is_open(void);
 bool wifi_mgmr_security_type_is_wpa(void);
diff --git a/src/platform/bouffalolab/BL616/BUILD.gn b/src/platform/bouffalolab/BL616/BUILD.gn
index 59d0b4378fc..ad067508d83 100644
--- a/src/platform/bouffalolab/BL616/BUILD.gn
+++ b/src/platform/bouffalolab/BL616/BUILD.gn
@@ -56,9 +56,9 @@ static_library("BL616") {
   }
 
   if (bouffalo_sdk_component_easyflash_enabled) {
-    sources += [ "../common/BLConfig.cpp" ]
+    sources += [ "../common/BflbConfig.cpp" ]
   } else {
-    sources += [ "../common/BLConfig_littlefs.cpp" ]
+    sources += [ "../common/BflbConfig_littlefs.cpp" ]
   }
 
   deps = [
@@ -96,7 +96,7 @@ static_library("BL616") {
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",
-      "ThreadStackManagerImpl.cpp",
+      "../common/ThreadStackManagerImpl.cpp",
     ]
 
     if (chip_mdns == "platform") {
@@ -109,5 +109,14 @@ static_library("BL616") {
     }
   }
 
+  if (chip_enable_ethernet) {
+    sources += [ "NetworkCommissioningEthernetDriver.cpp" ]
+
+    deps += [
+      "${chip_root}/src/app:app_config",
+      "${chip_root}/src/lib/dnssd:platform_header",
+    ]
+  }
+
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 }
diff --git a/src/platform/bouffalolab/BL616/CHIPMem-Platform.cpp b/src/platform/bouffalolab/BL616/CHIPMem-Platform.cpp
deleted file mode 100644
index 0e04b79a1cb..00000000000
--- a/src/platform/bouffalolab/BL616/CHIPMem-Platform.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 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.
- */
-
-/*
- *
- *    Copyright (c) 2020-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
- *      This file implements heap memory allocation APIs for CHIP. These functions are platform
- *      specific and might be C Standard Library heap functions re-direction in most of cases.
- *
- */
-
-#include <lib/support/CHIPMem.h>
-
-#include <mem.h>
-
-#if CHIP_CONFIG_MEMORY_MGMT_PLATFORM
-namespace chip {
-namespace Platform {
-
-CHIP_ERROR MemoryAllocatorInit(void * buf, size_t bufSize)
-{
-    return CHIP_NO_ERROR;
-}
-
-void MemoryAllocatorShutdown() {}
-
-void * MemoryAlloc(size_t size)
-{
-    return kmalloc(size);
-}
-
-void * MemoryCalloc(size_t num, size_t size)
-{
-    return kcalloc(size, num);
-}
-
-void * MemoryRealloc(void * p, size_t size)
-{
-    return realloc(p, size);
-}
-
-void MemoryFree(void * p)
-{
-    kfree(p);
-}
-
-bool MemoryInternalCheckPointer(const void * p, size_t min_size)
-{
-    return (p != nullptr);
-}
-
-} // namespace Platform
-} // namespace chip
-
-#endif // CHIP_CONFIG_MEMORY_MGMT_PLATFORM
diff --git a/src/platform/bouffalolab/BL616/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/BL616/ConfigurationManagerImpl.cpp
index f0b65b34bd8..6205cbb357a 100644
--- a/src/platform/bouffalolab/BL616/ConfigurationManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL616/ConfigurationManagerImpl.cpp
@@ -35,12 +35,13 @@ extern "C" {
 namespace chip {
 namespace DeviceLayer {
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
 {
     bflb_efuse_read_mac_address_opt(0, buf, 1);
 
     return CHIP_NO_ERROR;
 }
-
+#endif
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/bouffalolab/BL616/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/BL616/ConnectivityManagerImpl.cpp
index 77dfca05ca6..e2809a7255e 100644
--- a/src/platform/bouffalolab/BL616/ConnectivityManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL616/ConnectivityManagerImpl.cpp
@@ -17,10 +17,18 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <NetworkCommissioningDriver.h>
-
 #include <platform/DiagnosticDataProvider.h>
+
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
+#endif
+
+extern "C" {
+#undef IS_ENABLED
+#include <wifi_mgmr.h>
+#include <wifi_mgmr_ext.h>
+}
 
 #include <bl_fw_api.h>
 
@@ -31,8 +39,8 @@ namespace DeviceLayer {
 
 void ConnectivityManagerImpl::OnWiFiStationDisconnected()
 {
-    NetworkCommissioning::BLWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
-    uint16_t reason = NetworkCommissioning::BLWiFiDriver::GetInstance().GetLastDisconnectReason();
+    TEMPORARY_RETURN_IGNORED NetworkCommissioning::BflbWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
+    uint16_t reason = NetworkCommissioning::BflbWiFiDriver::GetInstance().GetLastDisconnectReason();
     uint8_t associationFailureCause =
         chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown);
     WiFiDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetWiFiDiagnosticsDelegate();
diff --git a/src/platform/bouffalolab/BL616/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL616/DiagnosticDataProviderImpl.cpp
index f62ae376218..4506696bd4a 100644
--- a/src/platform/bouffalolab/BL616/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL616/DiagnosticDataProviderImpl.cpp
@@ -21,12 +21,10 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-#include <lwip/tcpip.h>
-
 extern "C" {
+#undef IS_ENABLED
 #include <wifi_mgmr_ext.h>
 }
-#include <wifi_mgmr_portable.h>
 #endif
 
 namespace chip {
diff --git a/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.cpp
index 2b3ca4ce22c..24e74af0023 100644
--- a/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.cpp
+++ b/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.cpp
@@ -20,11 +20,13 @@
 #include <lwip/netif.h>
 #include <lwip/tcpip.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/bouffalolab/BL616/NetworkCommissioningDriver.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 extern "C" {
+#undef IS_ENABLED
+#include <wifi_mgmr.h>
 #include <wifi_mgmr_ext.h>
-}
 #include <wifi_mgmr_portable.h>
+}
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer::Internal;
@@ -34,16 +36,33 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 
-CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
+auto converter = [](const wifi_mgmr_scan_item_t & raw) -> WiFiScanResponse {
+    WiFiScanResponse item;
+
+    item.security.SetRaw(raw.auth);
+    item.ssidLen         = (uint32_t) (raw.ssid_len) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength
+                ? raw.ssid_len
+                : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength;
+    item.channel         = raw.channel;
+    item.wiFiBand        = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
+    item.signal.type     = WirelessSignalType::kdBm;
+    item.signal.strength = raw.rssi;
+    memcpy(item.ssid, raw.ssid, item.ssidLen);
+    memcpy(item.bssid, raw.bssid, 6);
+
+    return item;
+};
+
+CHIP_ERROR BflbWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     CHIP_ERROR err;
     size_t ssidLen        = 0;
     size_t credentialsLen = 0;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials,
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials,
                                                    sizeof(mSavedNetwork.credentials), &credentialsLen);
     SuccessOrExit(err);
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid),
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid),
                                                    &ssidLen);
     SuccessOrExit(err);
     mSavedNetwork.credentialsLen = credentialsLen;
@@ -64,35 +83,35 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     return err;
 }
 
-void BLWiFiDriver::Shutdown()
+void BflbWiFiDriver::Shutdown()
 {
     mpStatusChangeCallback = nullptr;
 }
 
-CHIP_ERROR BLWiFiDriver::CommitConfiguration()
+CHIP_ERROR BflbWiFiDriver::CommitConfiguration()
 {
-    ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::CommitConfiguration");
+    ChipLogProgress(NetworkProvisioning, "BflbWiFiDriver::CommitConfiguration");
     ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
+        PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
                                                                   mStagingNetwork.credentialsLen));
     mSavedNetwork = mStagingNetwork;
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BLWiFiDriver::RevertConfiguration()
+CHIP_ERROR BflbWiFiDriver::RevertConfiguration()
 {
     mStagingNetwork = mSavedNetwork;
     return CHIP_NO_ERROR;
 }
 
-bool BLWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
+bool BflbWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
 {
     return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
 }
 
-Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
-                                        uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
+                                          uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -110,7 +129,7 @@ Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mut
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -122,7 +141,7 @@ Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebu
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
+Status BflbWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
 {
     outDebugText.reduce_size(0);
 
@@ -132,7 +151,7 @@ Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCh
     return Status::kSuccess;
 }
 
-CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
+CHIP_ERROR BflbWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
 {
     wifi_mgmr_sta_connect_params_t conn_param = { 0 };
 
@@ -158,7 +177,7 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     return CHIP_NO_ERROR;
 }
 
-void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
+void BflbWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
 {
     if (mpConnectCallback)
     {
@@ -174,7 +193,7 @@ void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
     }
 }
 
-void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
+void BflbWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
     Status networkingStatus = Status::kSuccess;
@@ -200,7 +219,7 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
+void BflbWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
 {
     if (callback != nullptr)
     {
@@ -220,23 +239,18 @@ void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callba
     }
 }
 
-void BLWiFiDriver::OnScanWiFiNetworkDone()
+void BflbWiFiDriver::OnScanWiFiNetworkDone()
 {
-    uint32_t nums = wifi_mgmr_sta_scanlist_nums_get();
+    uint32_t nums                          = wifi_mgmr_sta_scanlist_nums_get();
+    struct wifi_mgmr_scan_item * pScanList = nullptr;
+    wifi_mgmr_scan_item_t * pScanResult    = nullptr;
+    uint32_t scanResultNum                 = 0;
+
     if (nums)
     {
-        wifi_mgmr_scan_item_t * pScanList = (wifi_mgmr_scan_item_t *) MemoryAlloc(nums * sizeof(wifi_mgmr_scan_item_t));
-
-        if (NULL == pScanList || 0 == wifi_mgmr_sta_scanlist_dump(pScanList, nums))
+        pScanList = (struct wifi_mgmr_scan_item *) MemoryAlloc(nums * sizeof(wifi_mgmr_scan_item_t));
+        if (pScanList && wifi_mgmr_sta_scanlist_dump(pScanList, nums))
         {
-            mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
-        }
-        else
-        {
-            wifi_mgmr_scan_item_t * pScanResult = NULL;
-            uint32_t scanResultNum              = 0;
-
             if (mScanSSIDlength)
             {
                 for (uint32_t i = 0; i < nums; i++)
@@ -254,36 +268,26 @@ void BLWiFiDriver::OnScanWiFiNetworkDone()
                 pScanResult   = pScanList;
                 scanResultNum = nums;
             }
-
-            if (CHIP_NO_ERROR != DeviceLayer::SystemLayer().ScheduleLambda([scanResultNum, pScanResult, pScanList]() {
-                    BLScanResponseIterator iter(scanResultNum, pScanResult);
-
-                    if (GetInstance().mpScanCallback)
-                    {
-                        GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
-                        GetInstance().mpScanCallback = nullptr;
-                    }
-                    else
-                    {
-                        ChipLogError(DeviceLayer, "can't find the ScanCallback function");
-                    }
-
-                    MemoryFree(pScanList);
-                }))
-            {
-                MemoryFree(pScanList);
-            }
         }
     }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "No AP found");
-        if (mpScanCallback != nullptr)
+
+    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([scanResultNum, pScanResult, pScanList]() {
+        if (GetInstance().mpScanCallback)
         {
-            mpScanCallback->OnFinished(Status::kNetworkNotFound, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
+            BflbScanResponseIterator iter(scanResultNum, pScanResult, converter);
+            GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
         }
+        else
+        {
+            ChipLogError(DeviceLayer, "can't find the ScanCallback function");
+        }
+    });
+
+    if (pScanList)
+    {
+        MemoryFree(pScanList);
     }
+    mScanSSIDlength = 0;
 }
 
 CHIP_ERROR GetConfiguredNetwork(Network & network)
@@ -301,7 +305,7 @@ CHIP_ERROR GetConfiguredNetwork(Network & network)
     return CHIP_ERROR_INTERNAL;
 }
 
-void BLWiFiDriver::OnNetworkStatusChange()
+void BflbWiFiDriver::OnNetworkStatusChange()
 {
     Network configuredNetwork;
 
@@ -324,24 +328,24 @@ void BLWiFiDriver::OnNetworkStatusChange()
     }
 }
 
-CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
+CHIP_ERROR BflbWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
 {
     mLastDisconnectedReason = wifi_mgmr_sta_info_status_code_get();
 
     return CHIP_NO_ERROR;
 }
 
-int32_t BLWiFiDriver::GetLastDisconnectReason()
+int32_t BflbWiFiDriver::GetLastDisconnectReason()
 {
     return mLastDisconnectedReason;
 }
 
-size_t BLWiFiDriver::WiFiNetworkIterator::Count()
+size_t BflbWiFiDriver::WiFiNetworkIterator::Count()
 {
     return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
 }
 
-bool BLWiFiDriver::WiFiNetworkIterator::Next(Network & item)
+bool BflbWiFiDriver::WiFiNetworkIterator::Next(Network & item)
 {
     if (mExhausted || mDriver->mStagingNetwork.ssidLen == 0)
     {
@@ -377,14 +381,14 @@ void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg)
     case kWiFiOnInitDone:
         break;
     case kWiFiOnScanDone:
-        BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
+        BflbWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
         break;
     case kWiFiOnConnecting:
         ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connecting);
         ConnectivityMgrImpl().OnConnectivityChanged(deviceInterface_getNetif());
         break;
     case kWiFiOnConnected:
-        BLWiFiDriver::GetInstance().OnNetworkStatusChange();
+        BflbWiFiDriver::GetInstance().OnNetworkStatusChange();
         break;
     case kGotIpAddress:
         ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManagerImpl::kWiFiStationState_Connected);
@@ -406,20 +410,17 @@ void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
-static wifi_conf_t conf = {
-    .country_code = "CN",
-};
-
-extern "C" void wifi_event_handler(uint32_t code)
+extern "C" void wifi_event_handler(async_input_event_t ev, void * priv)
 {
     ChipDeviceEvent event;
+    uint32_t code = ev->code;
 
     memset(&event, 0, sizeof(ChipDeviceEvent));
 
     switch (code)
     {
     case CODE_WIFI_ON_INIT_DONE:
-        wifi_mgmr_init(&conf);
+        wifi_mgmr_task_start();
         break;
     case CODE_WIFI_ON_MGMR_DONE:
         wifi_mgmr_sta_autoconnect_enable();
@@ -458,7 +459,6 @@ extern "C" void network_netif_ext_callback(struct netif * nif, netif_nsc_reason_
 
     if (((LWIP_NSC_IPV6_ADDR_STATE_CHANGED | LWIP_NSC_IPV6_SET) & reason) && args)
     {
-
         if (args->ipv6_addr_state_changed.addr_index >= LWIP_IPV6_NUM_ADDRESSES ||
             ip6_addr_islinklocal(netif_ip6_addr(nif, args->ipv6_addr_state_changed.addr_index)))
         {
diff --git a/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.h
index e66ff91a2da..e69de29bb2d 100644
--- a/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.h
+++ b/src/platform/bouffalolab/BL616/NetworkCommissioningDriver.h
@@ -1,154 +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.
- */
-
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-
-#pragma once
-extern "C" {
-#include <wifi_mgmr.h>
-}
-#include <platform/NetworkCommissioning.h>
-
-namespace chip {
-namespace DeviceLayer {
-namespace NetworkCommissioning {
-
-void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg);
-
-namespace {
-constexpr uint8_t kMaxWiFiNetworks                  = 1;
-constexpr uint8_t kWiFiScanNetworksTimeOutSeconds   = 10;
-constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 20;
-} // namespace
-
-class BLScanResponseIterator : public Iterator<WiFiScanResponse>
-{
-public:
-    BLScanResponseIterator(const size_t size, const wifi_mgmr_scan_item_t * scanResults) : mSize(size), mpScanResults(scanResults)
-    {}
-    size_t Count() override { return mSize; }
-    bool Next(WiFiScanResponse & item) override
-    {
-        if (mIternum >= mSize)
-        {
-            return false;
-        }
-
-        item.security.SetRaw(mpScanResults[mIternum].auth);
-        item.ssidLen         = (uint32_t) (mpScanResults[mIternum].ssid_len) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength
-                    ? mpScanResults[mIternum].ssid_len
-                    : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength;
-        item.channel         = mpScanResults[mIternum].channel;
-        item.wiFiBand        = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
-        item.signal.type     = NetworkCommissioning::WirelessSignalType::kdBm;
-        item.signal.strength = mpScanResults[mIternum].rssi;
-        memcpy(item.ssid, mpScanResults[mIternum].ssid, item.ssidLen);
-        memcpy(item.bssid, mpScanResults[mIternum].bssid, 6);
-
-        mIternum++;
-        return true;
-    }
-    void Release() override {}
-
-private:
-    const size_t mSize;
-    const wifi_mgmr_scan_item_t * mpScanResults;
-    size_t mIternum = 0;
-};
-
-class BLWiFiDriver final : public WiFiDriver
-{
-public:
-    class WiFiNetworkIterator final : public NetworkIterator
-    {
-    public:
-        WiFiNetworkIterator(BLWiFiDriver * aDriver) : mDriver(aDriver) {}
-        size_t Count() override;
-        bool Next(Network & item) override;
-        void Release() override { delete this; }
-        ~WiFiNetworkIterator() = default;
-
-    private:
-        BLWiFiDriver * mDriver;
-        bool mExhausted = false;
-    };
-
-    struct WiFiNetwork
-    {
-        char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength];
-        uint8_t ssidLen = 0;
-        char credentials[DeviceLayer::Internal::kMaxWiFiKeyLength];
-        uint8_t credentialsLen = 0;
-    };
-
-    // BaseDriver
-    NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
-    CHIP_ERROR Init(NetworkStatusChangeCallback * networkStatusChangeCallback) override;
-    void Shutdown();
-
-    // WirelessDriver
-    uint8_t GetMaxNetworks() override { return kMaxWiFiNetworks; }
-    uint8_t GetScanNetworkTimeoutSeconds() override { return kWiFiScanNetworksTimeOutSeconds; }
-    uint8_t GetConnectNetworkTimeoutSeconds() override { return kWiFiConnectNetworkTimeoutSeconds; }
-
-    CHIP_ERROR CommitConfiguration() override;
-    CHIP_ERROR SaveConfiguration();
-    CHIP_ERROR RevertConfiguration() override;
-
-    Status RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
-    Status ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText) override;
-    void ConnectNetwork(ByteSpan networkId, ConnectCallback * callback) override;
-
-    // WiFiDriver
-    Status AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
-                              uint8_t & outNetworkIndex) override;
-    void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override;
-
-    CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
-    CHIP_ERROR ReConnectWiFiNetwork(void);
-    void OnConnectWiFiNetwork(bool isConnected);
-    void OnScanWiFiNetworkDone();
-    void OnNetworkStatusChange();
-
-    CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
-    int32_t GetLastDisconnectReason();
-
-    static BLWiFiDriver & GetInstance()
-    {
-        static BLWiFiDriver instance;
-        return instance;
-    }
-
-private:
-    bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
-
-    WiFiNetwork mSavedNetwork;
-    WiFiNetwork mStagingNetwork;
-    ScanCallback * mpScanCallback;
-    ConnectCallback * mpConnectCallback;
-    NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
-    int32_t mLastDisconnectedReason;
-
-    char mScanSSID[DeviceLayer::Internal::kMaxWiFiSSIDLength];
-    int mScanSSIDlength;
-};
-
-} // namespace NetworkCommissioning
-} // namespace DeviceLayer
-} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/src/platform/bouffalolab/BL616/NetworkCommissioningEthernetDriver.cpp b/src/platform/bouffalolab/BL616/NetworkCommissioningEthernetDriver.cpp
new file mode 100644
index 00000000000..3149b2936a7
--- /dev/null
+++ b/src/platform/bouffalolab/BL616/NetworkCommissioningEthernetDriver.cpp
@@ -0,0 +1,134 @@
+/*
+ *
+ *    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.
+ */
+
+#include <FreeRTOS.h>
+#include <lwip/dhcp6.h>
+#include <lwip/ethip6.h>
+#include <lwip/netifapi.h>
+#include <task.h>
+
+extern "C" {
+#include <eth_phy.h>
+#include <lwip_netif_emac.h>
+}
+
+#include <lib/support/SafePointerCast.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
+
+using namespace chip::DeviceLayer::Internal;
+
+static struct netif gnetif;
+static netif_ext_callback_t netifExtCallback;
+
+extern "C" struct netif * deviceInterface_getNetif(void)
+{
+    return &gnetif;
+}
+
+namespace chip {
+namespace DeviceLayer {
+namespace NetworkCommissioning {
+
+void lwip_status_update_task(void * pvParameters)
+{
+    /* Infinite loop */
+    while (1)
+    {
+        vTaskDelay(200);
+
+        /* update link status */
+        eth_link_state_update(&gnetif);
+
+        LOCK_TCPIP_CORE();
+        if (!gnetif.ip6_autoconfig_enabled && netif_is_link_up(&gnetif))
+        {
+            gnetif.flags |= NETIF_FLAG_ETHERNET | NETIF_FLAG_MLD6;
+            gnetif.output_ip6 = ethip6_output;
+            netif_create_ip6_linklocal_address(&gnetif, 1);
+            gnetif.ip6_autoconfig_enabled = 1;
+        }
+        UNLOCK_TCPIP_CORE();
+
+        /* update dhcp status */
+        dhcp_sta_update(&gnetif);
+    }
+}
+
+void network_netif_ext_callback(struct netif * nif, netif_nsc_reason_t reason, const netif_ext_callback_args_t * args)
+{
+    if (((LWIP_NSC_IPV6_ADDR_STATE_CHANGED | LWIP_NSC_IPV6_SET) & reason) && args)
+    {
+        if (args->ipv6_addr_state_changed.addr_index >= LWIP_IPV6_NUM_ADDRESSES ||
+            ip6_addr_islinklocal(netif_ip6_addr(nif, args->ipv6_addr_state_changed.addr_index)))
+        {
+            return;
+        }
+
+        if (netif_ip6_addr_state(nif, args->ipv6_addr_state_changed.addr_index) != args->ipv6_addr_state_changed.old_state &&
+            ip6_addr_ispreferred(netif_ip6_addr_state(nif, args->ipv6_addr_state_changed.addr_index)))
+        {
+            ConnectivityMgrImpl().OnConnectivityChanged(deviceInterface_getNetif());
+        }
+    }
+
+    if ((LWIP_NSC_IPV4_SETTINGS_CHANGED & reason) && args)
+    {
+        if (!ip4_addr_isany(netif_ip4_addr(nif)) && !ip4_addr_isany(netif_ip4_gw(nif)))
+        {
+            ConnectivityMgrImpl().OnConnectivityChanged(deviceInterface_getNetif());
+        }
+    }
+}
+
+CHIP_ERROR BflbEthernetDriver::Init(BaseDriver::NetworkStatusChangeCallback * networkStatusChangeCallback)
+{
+    VerifyOrDie(netif_add(&gnetif, NULL, NULL, NULL, NULL, &eth_emac_if_init, &tcpip_input));
+
+    LOCK_TCPIP_CORE();
+    netif_set_default(&gnetif);
+    netif_add_ext_callback(&netifExtCallback, network_netif_ext_callback);
+    UNLOCK_TCPIP_CORE();
+
+    xTaskCreate(lwip_status_update_task, (char *) "lwip_sta_update", 256, NULL, osPriorityHigh, NULL);
+
+    return CHIP_NO_ERROR;
+}
+
+NetworkIterator * BflbEthernetDriver::GetNetworks()
+{
+    auto ret = new EthernetNetworkIterator();
+    memset(ret->interfaceName, 0, sizeof(ret->interfaceName));
+    if (netif_index_to_name(0, SafePointerCast<char *>(ret->interfaceName)))
+    {
+        ret->interfaceNameLen = NETIF_NAMESIZE;
+    }
+    else
+    {
+        ret->interfaceNameLen = 0;
+    }
+    return ret;
+}
+
+void BflbEthernetDriver::Shutdown()
+{
+    netif_remove_ext_callback(&netifExtCallback);
+}
+
+} // namespace NetworkCommissioning
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/bouffalolab/BL616/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL616/PlatformManagerImpl.cpp
index 4ed9920cfd8..cbeb947d119 100644
--- a/src/platform/bouffalolab/BL616/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL616/PlatformManagerImpl.cpp
@@ -22,8 +22,8 @@
 
 #include <platform/FreeRTOS/SystemTimeSupport.h>
 #include <platform/PlatformManager.h>
-#include <platform/bouffalolab/BL616/NetworkCommissioningDriver.h>
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
 #if CHIP_SYSTEM_CONFIG_USE_LWIP
@@ -43,7 +43,9 @@
 #include <bflb_sec_trng.h>
 extern "C" {
 #include <partition.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_THREAD
 #include <rfparam_adapter.h>
+#endif
 }
 
 namespace chip {
@@ -58,13 +60,14 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TaskHandle_t backup_eventLoopTask;
+    CHIP_ERROR err  = CHIP_NO_ERROR;
     int iret_rfInit = -1;
 
     pt_table_set_flash_operation(bflb_flash_erase, bflb_flash_write, bflb_flash_read);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_THREAD
     VerifyOrDieWithMsg(0 == (iret_rfInit = rfparam_init(0, NULL, 0)), DeviceLayer, "rfparam_init failed with %d", iret_rfInit);
+#endif
 
 #if CHIP_SYSTEM_CONFIG_USE_LWIP
     tcpip_init(NULL, NULL);
@@ -94,11 +97,8 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
-    /** weiyin, backup mEventLoopTask which is reset in _InitChipStack */
-    backup_eventLoopTask = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask;
-    err                  = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
+    err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
-    Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask = backup_eventLoopTask;
 
 exit:
     return err;
diff --git a/src/platform/bouffalolab/BL616/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL616/ThreadStackManagerImpl.cpp
deleted file mode 100644
index 17d73f9ea23..00000000000
--- a/src/platform/bouffalolab/BL616/ThreadStackManagerImpl.cpp
+++ /dev/null
@@ -1,171 +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 <platform/internal/CHIPDeviceLayerInternal.h>
-
-#include <platform/OpenThread/OpenThreadUtils.h>
-#include <platform/ThreadStackManager.h>
-
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp>
-
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <openthread/platform/entropy.h>
-
-#include <mbedtls/platform.h>
-
-#include <openthread_port.h>
-#include <utils_list.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-using namespace ::chip::DeviceLayer::Internal;
-
-ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;
-
-CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack(void)
-{
-    return InitThreadStack(NULL);
-}
-
-CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // Initialize the generic implementation base classes.
-    err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
-    SuccessOrExit(err);
-    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
-    SuccessOrExit(err);
-
-exit:
-    return err;
-}
-
-bool ThreadStackManagerImpl::IsInitialized()
-{
-    return sInstance.mThreadStackLock != NULL;
-}
-
-void ThreadStackManagerImpl::FactoryResetThreadStack(void)
-{
-    VerifyOrReturn(ThreadStackMgrImpl().OTInstance() != NULL);
-    otInstanceFactoryReset(ThreadStackMgrImpl().OTInstance());
-}
-
-} // namespace DeviceLayer
-} // namespace chip
-
-using namespace ::chip::DeviceLayer;
-
-ot_system_event_t ot_system_event_var = OT_SYSTEM_EVENT_NONE;
-
-void otSysProcessDrivers(otInstance * aInstance)
-{
-    ot_system_event_t sevent = otrGetNotifyEvent();
-
-    ot_alarmTask(sevent);
-    ot_radioTask(sevent);
-}
-
-extern "C" void otTaskletsSignalPending(otInstance * p_instance)
-{
-    otSysEventSignalPending();
-}
-
-extern "C" void otSysEventSignalPending(void)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        BaseType_t yieldRequired = ThreadStackMgrImpl().SignalThreadActivityPendingFromISR();
-        portYIELD_FROM_ISR(yieldRequired);
-    }
-    else
-    {
-        ThreadStackMgrImpl().SignalThreadActivityPending();
-    }
-}
-
-extern "C" otInstance * otrGetInstance()
-{
-    return ThreadStackMgrImpl().OTInstance();
-}
-
-extern "C" void otrLock(void)
-{
-    ThreadStackMgrImpl().LockThreadStack();
-}
-
-extern "C" void otrUnlock(void)
-{
-    ThreadStackMgrImpl().UnlockThreadStack();
-}
-
-extern "C" uint32_t otrEnterCrit(void)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        return taskENTER_CRITICAL_FROM_ISR();
-    }
-    else
-    {
-        taskENTER_CRITICAL();
-        return 0;
-    }
-}
-
-extern "C" void otrExitCrit(uint32_t tag)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        taskEXIT_CRITICAL_FROM_ISR(tag);
-    }
-    else
-    {
-        taskEXIT_CRITICAL();
-    }
-}
-
-extern "C" ot_system_event_t otrGetNotifyEvent(void)
-{
-    ot_system_event_t sevent = OT_SYSTEM_EVENT_NONE;
-
-    taskENTER_CRITICAL();
-    sevent              = ot_system_event_var;
-    ot_system_event_var = OT_SYSTEM_EVENT_NONE;
-    taskEXIT_CRITICAL();
-
-    return sevent;
-}
-
-extern "C" void otrNotifyEvent(ot_system_event_t sevent)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        ot_system_event_var = (ot_system_event_t) (ot_system_event_var | sevent);
-    }
-    else
-    {
-        uint32_t tag        = otrEnterCrit();
-        ot_system_event_var = (ot_system_event_t) (ot_system_event_var | sevent);
-        otrExitCrit(tag);
-    }
-
-    otSysEventSignalPending();
-}
diff --git a/src/platform/bouffalolab/BL616/args.gni b/src/platform/bouffalolab/BL616/args.gni
index 728448a6390..e7f74bfd0da 100644
--- a/src/platform/bouffalolab/BL616/args.gni
+++ b/src/platform/bouffalolab/BL616/args.gni
@@ -33,7 +33,7 @@ chip_build_tests = false
 openthread_external_mbedtls = mbedtls_target
 
 openthread_core_config_platform_check_file =
-    "bl616-openthread-core-bl-config-check.h"
+    "bl616-openthread-core-config-check.h"
 openthread_project_include_dirs =
     [ "${chip_root}/src/platform/bouffalolab/BL616" ]
 openthread_external_platform =
diff --git a/src/platform/bouffalolab/BL616/bl616-chip-mbedtls-config.h b/src/platform/bouffalolab/BL616/bl616-chip-mbedtls-config.h
index 32eeb078fbe..a81a3444e89 100644
--- a/src/platform/bouffalolab/BL616/bl616-chip-mbedtls-config.h
+++ b/src/platform/bouffalolab/BL616/bl616-chip-mbedtls-config.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2021, The OpenThread Authors.
+ *  Copyright (c) 2018, The OpenThread Authors.
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -26,137 +26,119 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#pragma once
-
 #ifndef MBEDTLS_CONFIG_H
 #define MBEDTLS_CONFIG_H
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/**
- * Enable FreeRTOS threading support
- */
-#define MBEDTLS_FREERTOS
-// #define MBEDTLS_THREADING_C
-
-/**
- * Enable H Crypto and Entropy modules
- */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ECDH_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_CIPHER_MODE_CTR
-#define MBEDTLS_TRNG_C
-
-#if defined(MBEDTLS_ECP_ALT) && !defined(MBEDTLS_ECP_RESTARTABLE)
-typedef void mbedtls_ecp_restart_ctx;
-#endif
 
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 
 #define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_CIPHER_MODE_CTR
 
 #define MBEDTLS_CIPHER_PADDING_PKCS7
 #define MBEDTLS_CIPHER_PADDING_ZEROS
 #define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
 #define MBEDTLS_REMOVE_3DES_CIPHERSUITES
 
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_CIPHER_MODE_CFB
-#define MBEDTLS_CMAC_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_DEBUG_C
-#define MBEDTLS_ECDH_LEGACY_CONTEXT
+#define MBEDTLS_ECDH_C
 #define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECDSA_DETERMINISTIC
-#define MBEDTLS_ECJPAKE_C
+// #define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP224R1_ENABLED
 #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+// #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+// #define MBEDTLS_ECP_DP_BP256R1_ENABLED
+// #define MBEDTLS_ECP_DP_BP384R1_ENABLED
+// #define MBEDTLS_ECP_DP_BP512R1_ENABLED
+// #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+// #define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
 #define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_ENTROPY_FORCE_SHA256
 
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_GCM_C
-#define MBEDTLS_ERROR_STRERROR_DUMMY
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HKDF_C
-#define MBEDTLS_HMAC_DRBG_C
+#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_PKCS1_V21
+
+#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_ALPN
+#define MBEDTLS_SSL_SESSION_TICKETS
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+#define MBEDTLS_X509_CHECK_KEY_USAGE
+#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
+
+#define MBEDTLS_AES_C
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_BASE64_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+// #define MBEDTLS_DEBUG_C
+#define MBEDTLS_ECP_C
+#define MBEDTLS_ENTROPY_C
+
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_GCM_C
 #define MBEDTLS_MD_C
 #define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
 #define MBEDTLS_PEM_PARSE_C
-#define MBEDTLS_PEM_WRITE_C
 #define MBEDTLS_PK_C
 #define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PK_WRITE_C
-#define MBEDTLS_PKCS5_C
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_PKCS1_V21
 
 #define MBEDTLS_PLATFORM_C
 #define MBEDTLS_GENPRIME
 #define MBEDTLS_RSA_C
 #define MBEDTLS_DHM_C
-
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_PSA_CRYPTO_C
-#define MBEDTLS_PSA_CRYPTO_CONFIG
-#define MBEDTLS_PSA_CRYPTO_DRIVERS
-#define MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
-#define MBEDTLS_PSA_CRYPTO_STORAGE_C
-
 #define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SHA256_C
 #define MBEDTLS_SHA512_C
 
-#define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_EXPORT_KEYS
-#define MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_ALPN
-#define MBEDTLS_SSL_SESSION_TICKETS
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
 #define MBEDTLS_X509_CREATE_C
 #define MBEDTLS_X509_CSR_WRITE_C
 #define MBEDTLS_X509_CRL_PARSE_C
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_CSR_PARSE_C
 #define MBEDTLS_X509_USE_C
-#define MBEDTLS_X509_CHECK_KEY_USAGE
-#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
+
+#define MBEDTLS_ECJPAKE_C
+#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+#define MBEDTLS_PK_WRITE_C
+#define MBEDTLS_ECDSA_DETERMINISTIC
+#define MBEDTLS_HMAC_DRBG_C
+#define MBEDTLS_SSL_EXPORT_KEYS
+#define MBEDTLS_SSL_PROTO_DTLS
+#define MBEDTLS_CMAC_C
+#define MBEDTLS_AES_C
+
+#define MBEDTLS_HKDF_C
+#define MBEDTLS_CCM_C
 
 #define MBEDTLS_NO_PLATFORM_ENTROPY
 #define MBEDTLS_ENTROPY_HARDWARE_ALT
 
 #define MBEDTLS_PLATFORM_STD_MEM_HDR "mbedtls_port_bouffalo_sdk.h"
-#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */
+#define MBEDTLS_SSL_MAX_CONTENT_LEN 900
 
 #define MBEDTLS_SHA1_ALT
 #define MBEDTLS_SHA256_ALT
@@ -168,6 +150,19 @@ typedef void mbedtls_ecp_restart_ctx;
 #error "ECP Restartable is not implemented with ECP HW acceleration!"
 #endif
 
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
+#include "mbedtls/config_psa.h"
+#endif
+
 #include "mbedtls/check_config.h"
 
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/src/platform/bouffalolab/BL616/bl616-openthread-core-bl-config-check.h b/src/platform/bouffalolab/BL616/bl616-openthread-core-config-check.h
similarity index 100%
rename from src/platform/bouffalolab/BL616/bl616-openthread-core-bl-config-check.h
rename to src/platform/bouffalolab/BL616/bl616-openthread-core-config-check.h
diff --git a/src/platform/bouffalolab/BL616/bl616-openthread-core-bl-config.h b/src/platform/bouffalolab/BL616/bl616-openthread-core-config.h
similarity index 95%
rename from src/platform/bouffalolab/BL616/bl616-openthread-core-bl-config.h
rename to src/platform/bouffalolab/BL616/bl616-openthread-core-config.h
index 8c4c5f3807a..5c706c351ab 100644
--- a/src/platform/bouffalolab/BL616/bl616-openthread-core-bl-config.h
+++ b/src/platform/bouffalolab/BL616/bl616-openthread-core-config.h
@@ -32,16 +32,8 @@
 #define OPENTHREAD_CONFIG_PLATFORM_INFO "BL616"
 
 // #define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_DEBG
-
-#if !defined(OPENTHREAD_FTD) && !defined(OPENTHREAD_MTD)
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-#define OPENTHREAD_FTD 1
-#define OPENTHREAD_MTD 0
-#else
-#define OPENTHREAD_FTD 0
-#define OPENTHREAD_MTD 1
-#endif
-#endif
+#define OPENTHREAD_CONFIG_LOG_PKT_DUMP 0
+#define OPENTHREAD_CONFIG_PLATFORM_ASSERT_MANAGEMENT 1
 
 #define OPENTHREAD_CONFIG_PING_SENDER_ENABLE 1
 
diff --git a/src/platform/bouffalolab/BL616/wifi_mgmr_portable.c b/src/platform/bouffalolab/BL616/wifi_mgmr_portable.c
index bf22cb51abc..7c594d4f67e 100644
--- a/src/platform/bouffalolab/BL616/wifi_mgmr_portable.c
+++ b/src/platform/bouffalolab/BL616/wifi_mgmr_portable.c
@@ -4,11 +4,8 @@
 #include <FreeRTOS.h>
 #include <lwip/tcpip.h>
 
-#include <bl_fw_api.h>
-#undef __INLINE
-#undef __PACKED
-#include <wifi_mgmr.h>
-
+#include <fhost_api.h>
+#include <wifi_mgmr_ext.h>
 #include <wifi_mgmr_portable.h>
 
 #define WIFI_STACK_SIZE (1536)
@@ -55,5 +52,7 @@ void wifi_start_firmware_task(void)
     netif_add_ext_callback(&netifExtCallback, network_netif_ext_callback);
     UNLOCK_TCPIP_CORE();
 
-    xTaskCreate(wifi_main, (char *) "fw", WIFI_STACK_SIZE, NULL, TASK_PRIORITY_FW, &wifi_fw_task);
+    async_register_event_filter(EV_WIFI, wifi_event_handler, NULL);
+    wifi_task_create();
+    fhost_init();
 }
diff --git a/src/platform/bouffalolab/BL616/wifi_mgmr_portable.h b/src/platform/bouffalolab/BL616/wifi_mgmr_portable.h
index 9ebffffa20e..f2309c2c628 100644
--- a/src/platform/bouffalolab/BL616/wifi_mgmr_portable.h
+++ b/src/platform/bouffalolab/BL616/wifi_mgmr_portable.h
@@ -5,8 +5,11 @@
 extern "C" {
 #endif
 
+#include <async_event.h>
+
 int wifi_start_scan(const uint8_t * ssid, uint32_t length);
 void network_netif_ext_callback(struct netif * netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t * args);
+void wifi_event_handler(async_input_event_t ev, void * priv);
 void wifi_start_firmware_task(void);
 
 struct netif * deviceInterface_getNetif(void);
diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn
index 46ed7e1c227..b95909b8380 100644
--- a/src/platform/bouffalolab/BL702/BUILD.gn
+++ b/src/platform/bouffalolab/BL702/BUILD.gn
@@ -59,9 +59,9 @@ static_library("BL702") {
   }
 
   if (bouffalo_sdk_component_easyflash_enabled) {
-    sources += [ "../common/BLConfig.cpp" ]
+    sources += [ "../common/BflbConfig.cpp" ]
   } else {
-    sources += [ "../common/BLConfig_littlefs.cpp" ]
+    sources += [ "../common/BflbConfig_littlefs.cpp" ]
   }
 
   deps = [
@@ -101,7 +101,7 @@ static_library("BL702") {
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",
-      "ThreadStackManagerImpl.cpp",
+      "../common/ThreadStackManagerImpl.cpp",
     ]
 
     if (chip_mdns == "platform") {
@@ -118,7 +118,7 @@ static_library("BL702") {
     sources += [
       "ConfigurationManagerImpl.cpp",
       "ConnectivityManagerImpl.cpp",
-      "EthernetInterface.c",
+      "NetworkCommissioningEthernetDriver.cpp",
     ]
 
     deps += [
diff --git a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
index d8e9f430a67..1da79f3fbad 100644
--- a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
@@ -21,10 +21,6 @@
 #include <platform/bouffalolab/BL702/wifi_mgmr_portable.h>
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-#include "EthernetInterface.h"
-#endif // CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-
 namespace chip {
 namespace DeviceLayer {
 
@@ -37,17 +33,5 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
 }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-CHIP_ERROR ConfigurationManagerImpl::GetPrimaryMACAddress(MutableByteSpan & buf)
-{
-    if (buf.size() != ConfigurationManager::kPrimaryMACAddressLength)
-        return CHIP_ERROR_INVALID_ARGUMENT;
-
-    memcpy(buf.data(), deviceInterface_getNetif()->hwaddr, ConfigurationManager::kPrimaryMACAddressLength);
-
-    return CHIP_NO_ERROR;
-}
-#endif // CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp
index 01730a6c564..505a047891b 100644
--- a/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp
@@ -22,8 +22,8 @@
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-#include <platform/bouffalolab/BL702/NetworkCommissioningDriver.h>
 #include <platform/bouffalolab/BL702/wifi_mgmr_portable.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
 #if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
@@ -44,8 +44,8 @@ void ConnectivityManagerImpl::OnWiFiStationDisconnected()
     event.WiFiConnectivityChange.Result = kConnectivity_Lost;
     PlatformMgr().PostEventOrDie(&event);
 
-    TEMPORARY_RETURN_IGNORED NetworkCommissioning::BLWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
-    uint16_t reason = NetworkCommissioning::BLWiFiDriver::GetInstance().GetLastDisconnectReason();
+    TEMPORARY_RETURN_IGNORED NetworkCommissioning::BflbWiFiDriver::GetInstance().SetLastDisconnectReason(NULL);
+    uint16_t reason = NetworkCommissioning::BflbWiFiDriver::GetInstance().GetLastDisconnectReason();
     uint8_t associationFailureCause =
         chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown);
     WiFiDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetWiFiDiagnosticsDelegate();
@@ -111,42 +111,35 @@ extern "C" void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_
     ChipLogProgress(DeviceLayer, "wifiInterface_eventScanDone");
 
     memset(&event, 0, sizeof(ChipDeviceEvent));
-    NetworkCommissioning::BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone(pmsg);
+    NetworkCommissioning::BflbWiFiDriver::GetInstance().OnScanWiFiNetworkDone(pmsg);
 
     event.Type = kWiFiOnScanDone;
     PlatformMgr().PostEventOrDie(&event);
 }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-extern "C" void ethernetInterface_eventGotIP(struct netif * interface)
-{
-    ChipLogProgress(DeviceLayer, "ethernetInterface_eventGotIP");
-    ConnectivityMgrImpl().OnConnectivityChanged(interface);
-}
-#endif // CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
 extern "C" void network_netif_ext_callback(struct netif * nif, netif_nsc_reason_t reason, const netif_ext_callback_args_t * args)
 {
-    ChipDeviceEvent event;
-
-    memset(&event, 0, sizeof(ChipDeviceEvent));
+    if (nullptr == args || nullptr == nif)
+    {
+        return;
+    }
 
-    if ((LWIP_NSC_IPV6_ADDR_STATE_CHANGED & reason) && args)
+    if ((LWIP_NSC_IPV4_SETTINGS_CHANGED) &reason)
     {
-        if (args->ipv6_addr_state_changed.addr_index >= LWIP_IPV6_NUM_ADDRESSES ||
-            ip6_addr_islinklocal(netif_ip6_addr(nif, args->ipv6_addr_state_changed.addr_index)))
+        if (memcmp(netif_ip4_addr(nif), args->ipv4_changed.old_address, sizeof(ip4_addr_t)) ||
+            memcmp(netif_ip4_netmask(nif), args->ipv4_changed.old_netmask, sizeof(ip4_addr_t)) ||
+            memcmp(netif_ip4_gw(nif), args->ipv4_changed.old_gw, sizeof(ip4_addr_t)))
         {
+            ConnectivityMgrImpl().OnConnectivityChanged(nif);
             return;
         }
+    }
 
-        if (netif_ip6_addr_state(nif, args->ipv6_addr_state_changed.addr_index) != args->ipv6_addr_state_changed.old_state &&
-            ip6_addr_ispreferred(netif_ip6_addr_state(nif, args->ipv6_addr_state_changed.addr_index)))
-        {
-            event.Type = kGotIpv6Address;
-            PlatformMgr().PostEventOrDie(&event);
-        }
+    if (LWIP_NSC_IPV6_ADDR_STATE_CHANGED & reason)
+    {
+        ConnectivityMgrImpl().OnConnectivityChanged(nif);
     }
 }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
diff --git a/src/platform/bouffalolab/BL702/EthernetInterface.h b/src/platform/bouffalolab/BL702/EthernetInterface.h
index 98e1a7fa03d..f770d0fdacd 100644
--- a/src/platform/bouffalolab/BL702/EthernetInterface.h
+++ b/src/platform/bouffalolab/BL702/EthernetInterface.h
@@ -21,8 +21,6 @@
 extern "C" {
 #endif
 
-void ethernetInterface_init(void);
-void ethernetInterface_eventGotIP(struct netif * interface);
 struct netif * deviceInterface_getNetif(void);
 
 void network_netif_ext_callback(struct netif * netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t * args);
diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp
index 6a01ae1a9ba..a1ccb44f484 100644
--- a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp
+++ b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp
@@ -15,9 +15,10 @@
  *    limitations under the License.
  */
 
+#include <lib/support/SafePointerCast.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/bouffalolab/BL702/NetworkCommissioningDriver.h>
 #include <platform/bouffalolab/BL702/wifi_mgmr_portable.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer::Internal;
@@ -26,7 +27,9 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 
-CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
+auto converter = [](const WiFiScanResponse & raw) -> WiFiScanResponse { return raw; };
+
+CHIP_ERROR BflbWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     CHIP_ERROR err;
     size_t ssidLen        = 0;
@@ -36,10 +39,10 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     mpConnectCallback      = nullptr;
     mpStatusChangeCallback = networkStatusChangeCallback;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.credentials,
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiSSID, mSavedNetwork.credentials,
                                                    sizeof(mSavedNetwork.credentials), &credentialsLen);
     SuccessOrExit(err);
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.ssid,
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiPassword, mSavedNetwork.ssid,
                                                    sizeof(mSavedNetwork.ssid), &ssidLen);
     SuccessOrExit(err);
 
@@ -47,7 +50,7 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     mSavedNetwork.ssidLen        = ssidLen;
 
     mStagingNetwork = mSavedNetwork;
-    mScanSpecific   = false;
+    mScanSSIDlength = 0;
 
 exit:
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
@@ -59,37 +62,37 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     return err;
 }
 
-void BLWiFiDriver::Shutdown()
+void BflbWiFiDriver::Shutdown()
 {
     mpStatusChangeCallback = nullptr;
-    mScanSpecific          = false;
+    mScanSSIDlength        = 0;
     memset(mScanSSID, 0, sizeof(mScanSSID));
 }
 
-CHIP_ERROR BLWiFiDriver::CommitConfiguration()
+CHIP_ERROR BflbWiFiDriver::CommitConfiguration()
 {
-    ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::CommitConfiguration");
+    ChipLogProgress(NetworkProvisioning, "BflbWiFiDriver::CommitConfiguration");
     ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
+        PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BflbConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials,
                                                                   mStagingNetwork.credentialsLen));
     mSavedNetwork = mStagingNetwork;
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BLWiFiDriver::RevertConfiguration()
+CHIP_ERROR BflbWiFiDriver::RevertConfiguration()
 {
     mStagingNetwork = mSavedNetwork;
     return CHIP_NO_ERROR;
 }
 
-bool BLWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
+bool BflbWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
 {
     return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
 }
 
-Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
-                                        uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
+                                          uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -107,7 +110,7 @@ Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mut
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
+Status BflbWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
 {
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
@@ -118,7 +121,7 @@ Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebu
     return Status::kSuccess;
 }
 
-Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
+Status BflbWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
 {
     outDebugText.reduce_size(0);
 
@@ -128,7 +131,7 @@ Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCh
     return Status::kSuccess;
 }
 
-CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
+CHIP_ERROR BflbWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
 {
     ChipLogProgress(NetworkProvisioning, "ConnectWiFiNetwork");
     // Valid Credentials length are:
@@ -141,12 +144,12 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     // - 64 bytes: WPA/WPA2/WPA3 raw hex PSK
     // Note 10 hex WEP64 and 13 bytes / 26 hex WEP128 passphrase are covered by 8~63 bytes WPA passphrase, so we don't check WEP64
     // hex and WEP128 passphrase.
-    if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BLWiFiDriver::WiFiCredentialLength::kWEP64 ||
-        (keyLen >= BLWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BLWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
+    if (keyLen == BflbWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BflbWiFiDriver::WiFiCredentialLength::kWEP64 ||
+        (keyLen >= BflbWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BflbWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
     {
         wifiInterface_disconnect();
         vTaskDelay(500);
-        if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen)
+        if (keyLen == BflbWiFiDriver::WiFiCredentialLength::kOpen)
         {
             wifiInterface_connect((char *) ssid, NULL);
         }
@@ -163,9 +166,9 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     return CHIP_NO_ERROR;
 }
 
-void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
+void BflbWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
 {
-    ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::OnConnectWiFiNetwork, isConnected=%d\r\n", isConnected);
+    ChipLogProgress(NetworkProvisioning, "BflbWiFiDriver::OnConnectWiFiNetwork, isConnected=%d\r\n", isConnected);
     if (mpConnectCallback)
     {
         if (isConnected)
@@ -180,7 +183,7 @@ void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected)
     }
 }
 
-void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
+void BflbWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
     Status networkingStatus = Status::kSuccess;
@@ -206,7 +209,7 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
+void BflbWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
 {
     if (callback != nullptr)
     {
@@ -214,7 +217,7 @@ void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callba
         {
             memset(mScanSSID, 0, sizeof(mScanSSID));
             memcpy(mScanSSID, ssid.data(), ssid.size());
-            mScanSpecific = true;
+            mScanSSIDlength = ssid.size();
         }
 
         mScanResponseNum = 0;
@@ -223,7 +226,7 @@ void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callba
     }
 }
 
-void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
+void BflbWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
 {
     netbus_wifi_mgmr_msg_cmd_t * pkg_data = (netbus_wifi_mgmr_msg_cmd_t *) ((struct pkg_protocol *) opaque)->payload;
     netbus_fs_scan_ind_cmd_msg_t * pmsg   = (netbus_fs_scan_ind_cmd_msg_t *) ((netbus_fs_scan_ind_cmd_msg_t *) pkg_data);
@@ -231,22 +234,24 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
     size_t i = 0, ap_num = 0, ap_cnt = 0;
     WiFiScanResponse *pScanResponse, *p;
 
-    ChipLogProgress(DeviceLayer, "expected ssid %s. get %d in total, %d", mScanSSID, pmsg->num, mScanSpecific);
-
-    if (mScanSpecific)
+    if (mScanSSIDlength)
     {
         for (i = 0; i < pmsg->num; i++)
         {
-            if (mScanSpecific && !strcmp(mScanSSID, (char *) (pmsg->records[i].ssid)))
+            if (0 == strncmp(mScanSSID, (char *) (pmsg->records[i].ssid), mScanSSIDlength))
             {
                 ap_num = 1;
                 break;
             }
         }
+
+        ChipLogProgress(DeviceLayer, "Wi-Fi SSID scanned %d in total, %s matched SSID %s", pmsg->num, ap_num ? "with" : "without",
+                        mScanSSID);
     }
     else
     {
         ap_num = pmsg->num;
+        ChipLogProgress(DeviceLayer, "Wi-Fi SSID scanned %d in total", pmsg->num);
     }
 
     if (ap_num)
@@ -259,7 +264,7 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
 
         for (i = 0; i < pmsg->num; i++)
         {
-            if (mScanSpecific && strcmp(mScanSSID, (char *) (pmsg->records[i].ssid)))
+            if (mScanSSIDlength && strncmp(mScanSSID, (char *) (pmsg->records[i].ssid), mScanSSIDlength))
             {
                 continue;
             }
@@ -284,45 +289,34 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque)
     }
 
     mScanResponseNum = ap_cnt;
+
+    OnScanWiFiNetworkDone();
 }
 
-void BLWiFiDriver::OnScanWiFiNetworkDone(void)
+void BflbWiFiDriver::OnScanWiFiNetworkDone(void)
 {
     size_t ap_cnt                    = mScanResponseNum;
     WiFiScanResponse * pScanResponse = mScanResponse;
 
-    if (mScanResponse)
-    {
-        if (CHIP_NO_ERROR == DeviceLayer::SystemLayer().ScheduleLambda([ap_cnt, pScanResponse]() {
-                BLScanResponseIterator iter(ap_cnt, pScanResponse);
-                if (GetInstance().mpScanCallback)
-                {
-                    GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
-                    GetInstance().mpScanCallback = nullptr;
-                }
-                else
-                {
-                    ChipLogError(DeviceLayer, "can't find the ScanCallback function");
-                }
-            }))
+    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([ap_cnt, pScanResponse]() {
+        if (GetInstance().mpScanCallback)
         {
-            ChipLogProgress(DeviceLayer, "ScheduleLambda OK");
+            BflbScanResponseIterator iter(ap_cnt, pScanResponse, converter);
+            GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
         }
-
-        free(mScanResponse);
-        mScanResponse = nullptr;
-    }
-    else
-    {
-        ChipLogProgress(DeviceLayer, "No AP found");
-        if (mpScanCallback != nullptr)
+        else
         {
-            mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
+            ChipLogError(DeviceLayer, "can't find the ScanCallback function");
         }
-    }
+    });
 
+    if (mScanResponse)
+    {
+        free(mScanResponse);
+    }
+    mScanResponse    = nullptr;
     mScanResponseNum = 0;
+    mScanSSIDlength  = 0;
 }
 
 CHIP_ERROR GetConfiguredNetwork(Network & network)
@@ -348,7 +342,7 @@ CHIP_ERROR GetConfiguredNetwork(Network & network)
     return CHIP_NO_ERROR;
 }
 
-void BLWiFiDriver::OnNetworkStatusChange()
+void BflbWiFiDriver::OnNetworkStatusChange()
 {
     Network configuredNetwork;
     bool staConnected = false;
@@ -379,7 +373,7 @@ void BLWiFiDriver::OnNetworkStatusChange()
         Status::kUnknownError, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)), NullOptional);
 }
 
-CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
+CHIP_ERROR BflbWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
 {
     // TODO: to be added
     mLastDisconnectedReason = 0;
@@ -387,17 +381,17 @@ CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
     return CHIP_NO_ERROR;
 }
 
-int32_t BLWiFiDriver::GetLastDisconnectReason()
+int32_t BflbWiFiDriver::GetLastDisconnectReason()
 {
     return mLastDisconnectedReason;
 }
 
-size_t BLWiFiDriver::WiFiNetworkIterator::Count()
+size_t BflbWiFiDriver::WiFiNetworkIterator::Count()
 {
     return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
 }
 
-bool BLWiFiDriver::WiFiNetworkIterator::Next(Network & item)
+bool BflbWiFiDriver::WiFiNetworkIterator::Next(Network & item)
 {
     if (mExhausted || mDriver->mStagingNetwork.ssidLen == 0)
     {
@@ -434,7 +428,7 @@ void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg)
     case kWiFiOnInitDone:
         break;
     case kWiFiOnConnected:
-        BLWiFiDriver::GetInstance().OnNetworkStatusChange();
+        BflbWiFiDriver::GetInstance().OnNetworkStatusChange();
         break;
     case kGotIpAddress:
         ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManagerImpl::kWiFiStationState_Connected);
diff --git a/src/platform/bouffalolab/BL702/EthernetInterface.c b/src/platform/bouffalolab/BL702/NetworkCommissioningEthernetDriver.cpp
similarity index 59%
rename from src/platform/bouffalolab/BL702/EthernetInterface.c
rename to src/platform/bouffalolab/BL702/NetworkCommissioningEthernetDriver.cpp
index 82ded1b92d6..1886889d5d7 100644
--- a/src/platform/bouffalolab/BL702/EthernetInterface.c
+++ b/src/platform/bouffalolab/BL702/NetworkCommissioningEthernetDriver.cpp
@@ -1,6 +1,6 @@
 /*
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
+ *
+ *    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.
@@ -15,26 +15,32 @@
  *    limitations under the License.
  */
 
+extern "C" {
 #include <eth_bd.h>
+}
 #include <lwip/dhcp6.h>
 #include <lwip/netifapi.h>
 
-#include "EthernetInterface.h"
-static struct dhcp6 dhcp6_val;
-static netif_ext_callback_t netifExtCallback;
+#include <lib/support/SafePointerCast.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 
-static void netif_status_callback(struct netif * netif)
-{
-    if ((netif->flags & NETIF_FLAG_UP) && !ip4_addr_isany(netif_ip4_addr(netif)))
-    {
-        printf("IP: %s\r\n", ip4addr_ntoa(netif_ip4_addr(netif)));
-        printf("MASK: %s\r\n", ip4addr_ntoa(netif_ip4_netmask(netif)));
-        printf("Gateway: %s\r\n", ip4addr_ntoa(netif_ip4_gw(netif)));
+#include <EthernetInterface.h>
 
-        ethernetInterface_eventGotIP(netif);
-    }
+using namespace chip::DeviceLayer::Internal;
+
+extern "C" struct netif * deviceInterface_getNetif(void)
+{
+    return &eth_mac;
 }
 
+namespace chip {
+namespace DeviceLayer {
+namespace NetworkCommissioning {
+
+static struct dhcp6 dhcp6_val;
+static netif_ext_callback_t netifExtCallback;
+
 static int ethernet_callback(eth_link_state val)
 {
     switch (val)
@@ -61,19 +67,37 @@ static int ethernet_callback(eth_link_state val)
     return 0;
 }
 
-void ethernetInterface_init(void)
+CHIP_ERROR BflbEthernetDriver::Init(BaseDriver::NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     netif_add(&eth_mac, NULL, NULL, NULL, NULL, eth_init, ethernet_input);
 
     ethernet_init(ethernet_callback);
 
-    /* Set callback to be called when interface is brought up/down or address is changed while up */
-    netif_set_status_callback(&eth_mac, netif_status_callback);
-
     netif_add_ext_callback(&netifExtCallback, network_netif_ext_callback);
+
+    return CHIP_NO_ERROR;
 }
 
-struct netif * deviceInterface_getNetif(void)
+NetworkIterator * BflbEthernetDriver::GetNetworks()
 {
-    return &eth_mac;
+    auto ret = new EthernetNetworkIterator();
+    memset(ret->interfaceName, 0, sizeof(ret->interfaceName));
+    if (netif_index_to_name(0, SafePointerCast<char *>(ret->interfaceName)))
+    {
+        ret->interfaceNameLen = NETIF_NAMESIZE;
+    }
+    else
+    {
+        ret->interfaceNameLen = 0;
+    }
+    return ret;
+}
+
+void BflbEthernetDriver::Shutdown()
+{
+    netif_remove_ext_callback(&netifExtCallback);
 }
+
+} // namespace NetworkCommissioning
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
index 94835f921c7..a2dd0bf1f48 100644
--- a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
@@ -63,7 +63,6 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     CHIP_ERROR err;
-    TaskHandle_t backup_eventLoopTask;
 
 #if CHIP_SYSTEM_CONFIG_USE_LWIP
     // Initialize LwIP.
@@ -84,20 +83,13 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
-    /** weiyin, backup mEventLoopTask which is reset in _InitChipStack */
-    backup_eventLoopTask = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask;
-    err                  = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
+    err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
-    Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask = backup_eventLoopTask;
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     wifi_start_firmware_task();
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-    ethernetInterface_init();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-
 exit:
     return err;
 }
diff --git a/src/platform/bouffalolab/BL702/args.gni b/src/platform/bouffalolab/BL702/args.gni
index ba296271710..fc059bd8ac7 100644
--- a/src/platform/bouffalolab/BL702/args.gni
+++ b/src/platform/bouffalolab/BL702/args.gni
@@ -36,7 +36,7 @@ chip_build_tests = false
 openthread_external_mbedtls = mbedtls_target
 
 openthread_core_config_platform_check_file =
-    "bl702-openthread-core-bl-config-check.h"
+    "bl702-openthread-core-config-check.h"
 openthread_project_include_dirs =
     [ "${chip_root}/src/platform/bouffalolab/BL702" ]
 openthread_external_platform =
diff --git a/src/platform/bouffalolab/BL702/bl702-chip-mbedtls-config.h b/src/platform/bouffalolab/BL702/bl702-chip-mbedtls-config.h
index c8a7d8cb796..de51ebcfe91 100644
--- a/src/platform/bouffalolab/BL702/bl702-chip-mbedtls-config.h
+++ b/src/platform/bouffalolab/BL702/bl702-chip-mbedtls-config.h
@@ -30,8 +30,6 @@
 #ifndef MBEDTLS_CONFIG_H
 #define MBEDTLS_CONFIG_H
 
-// #include "openthread-core-config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/platform/bouffalolab/BL702/bl702-openthread-core-bl-config-check.h b/src/platform/bouffalolab/BL702/bl702-openthread-core-config-check.h
similarity index 100%
rename from src/platform/bouffalolab/BL702/bl702-openthread-core-bl-config-check.h
rename to src/platform/bouffalolab/BL702/bl702-openthread-core-config-check.h
diff --git a/src/platform/bouffalolab/BL702/bl702-openthread-core-bl-config.h b/src/platform/bouffalolab/BL702/bl702-openthread-core-config.h
similarity index 100%
rename from src/platform/bouffalolab/BL702/bl702-openthread-core-bl-config.h
rename to src/platform/bouffalolab/BL702/bl702-openthread-core-config.h
diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn
index 2c17c317353..41628d6dbf2 100644
--- a/src/platform/bouffalolab/BL702L/BUILD.gn
+++ b/src/platform/bouffalolab/BL702L/BUILD.gn
@@ -57,9 +57,9 @@ static_library("BL702L") {
   }
 
   if (bouffalo_sdk_component_easyflash_enabled) {
-    sources += [ "../common/BLConfig.cpp" ]
+    sources += [ "../common/BflbConfig.cpp" ]
   } else {
-    sources += [ "../common/BLConfig_littlefs.cpp" ]
+    sources += [ "../common/BflbConfig_littlefs.cpp" ]
   }
 
   deps = [
@@ -89,7 +89,7 @@ static_library("BL702L") {
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",
-      "ThreadStackManagerImpl.cpp",
+      "../common/ThreadStackManagerImpl.cpp",
     ]
 
     if (chip_mdns == "platform") {
diff --git a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
index 2cd84609ef0..84cc0471ba9 100644
--- a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
@@ -54,7 +54,6 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     CHIP_ERROR err;
-    TaskHandle_t backup_eventLoopTask;
 
     otRadio_opt_t opt;
     opt.byte = 0;
@@ -83,11 +82,8 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
-    /** weiyin, backup mEventLoopTask which is reset in _InitChipStack */
-    backup_eventLoopTask = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask;
-    err                  = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
+    err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
-    Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::mEventLoopTask = backup_eventLoopTask;
 
 exit:
     return err;
diff --git a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
deleted file mode 100644
index a2072eff6be..00000000000
--- a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
+++ /dev/null
@@ -1,156 +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 <platform/internal/CHIPDeviceLayerInternal.h>
-
-#include <platform/OpenThread/OpenThreadUtils.h>
-#include <platform/ThreadStackManager.h>
-
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp>
-
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <openthread/platform/entropy.h>
-
-#include <mbedtls/platform.h>
-
-#include <openthread_port.h>
-#include <utils_list.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-using namespace ::chip::DeviceLayer::Internal;
-
-ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;
-
-CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack(void)
-{
-    return InitThreadStack(NULL);
-}
-
-CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // Initialize the generic implementation base classes.
-    err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
-    SuccessOrExit(err);
-    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
-    SuccessOrExit(err);
-
-    mbedtls_platform_set_calloc_free(pvPortCalloc, vPortFree);
-
-exit:
-    return err;
-}
-
-bool ThreadStackManagerImpl::IsInitialized()
-{
-    return sInstance.mThreadStackLock != NULL;
-}
-
-void ThreadStackManagerImpl::FactoryResetThreadStack(void)
-{
-    VerifyOrReturn(ThreadStackMgrImpl().OTInstance() != NULL);
-    otInstanceFactoryReset(ThreadStackMgrImpl().OTInstance());
-}
-
-} // namespace DeviceLayer
-} // namespace chip
-
-using namespace ::chip::DeviceLayer;
-
-ot_system_event_t ot_system_event_var = OT_SYSTEM_EVENT_NONE;
-
-void otSysProcessDrivers(otInstance * aInstance)
-{
-    ot_system_event_t sevent = otrGetNotifyEvent();
-
-    ot_alarmTask(sevent);
-    ot_radioTask(sevent);
-}
-
-extern "C" void otTaskletsSignalPending(otInstance * p_instance)
-{
-    otSysEventSignalPending();
-}
-
-extern "C" void otSysEventSignalPending(void)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        BaseType_t yieldRequired = ThreadStackMgrImpl().SignalThreadActivityPendingFromISR();
-        portYIELD_FROM_ISR(yieldRequired);
-    }
-    else
-    {
-        ThreadStackMgrImpl().SignalThreadActivityPending();
-    }
-}
-
-extern "C" otInstance * otrGetInstance()
-{
-    return ThreadStackMgrImpl().OTInstance();
-}
-
-extern "C" uint32_t otrEnterCrit(void)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        return taskENTER_CRITICAL_FROM_ISR();
-    }
-    else
-    {
-        taskENTER_CRITICAL();
-        return 0;
-    }
-}
-
-extern "C" void otrExitCrit(uint32_t tag)
-{
-    if (xPortIsInsideInterrupt())
-    {
-        taskEXIT_CRITICAL_FROM_ISR(tag);
-    }
-    else
-    {
-        taskEXIT_CRITICAL();
-    }
-}
-
-extern "C" ot_system_event_t otrGetNotifyEvent(void)
-{
-    ot_system_event_t sevent = OT_SYSTEM_EVENT_NONE;
-
-    taskENTER_CRITICAL();
-    sevent              = ot_system_event_var;
-    ot_system_event_var = OT_SYSTEM_EVENT_NONE;
-    taskEXIT_CRITICAL();
-
-    return sevent;
-}
-
-extern "C" void otrNotifyEvent(ot_system_event_t sevent)
-{
-    uint32_t tag        = otrEnterCrit();
-    ot_system_event_var = (ot_system_event_t) (ot_system_event_var | sevent);
-    otrExitCrit(tag);
-
-    otSysEventSignalPending();
-}
diff --git a/src/platform/bouffalolab/BL702L/args.gni b/src/platform/bouffalolab/BL702L/args.gni
index f9a81a293f4..7aff706022c 100644
--- a/src/platform/bouffalolab/BL702L/args.gni
+++ b/src/platform/bouffalolab/BL702L/args.gni
@@ -35,7 +35,7 @@ chip_build_tests = false
 openthread_external_mbedtls = mbedtls_target
 
 openthread_core_config_platform_check_file =
-    "bl702l-openthread-core-bl-config-check.h"
+    "bl702l-openthread-core-config-check.h"
 openthread_project_include_dirs =
     [ "${chip_root}/src/platform/bouffalolab/BL702L" ]
 openthread_external_platform =
diff --git a/src/platform/bouffalolab/BL702L/bl702l-chip-mbedtls-config.h b/src/platform/bouffalolab/BL702L/bl702l-chip-mbedtls-config.h
index c8a7d8cb796..de51ebcfe91 100644
--- a/src/platform/bouffalolab/BL702L/bl702l-chip-mbedtls-config.h
+++ b/src/platform/bouffalolab/BL702L/bl702l-chip-mbedtls-config.h
@@ -30,8 +30,6 @@
 #ifndef MBEDTLS_CONFIG_H
 #define MBEDTLS_CONFIG_H
 
-// #include "openthread-core-config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/platform/bouffalolab/BL702L/bl702l-openthread-core-bl-config-check.h b/src/platform/bouffalolab/BL702L/bl702l-openthread-core-config-check.h
similarity index 100%
rename from src/platform/bouffalolab/BL702L/bl702l-openthread-core-bl-config-check.h
rename to src/platform/bouffalolab/BL702L/bl702l-openthread-core-config-check.h
diff --git a/src/platform/bouffalolab/BL702L/bl702l-openthread-core-bl-config.h b/src/platform/bouffalolab/BL702L/bl702l-openthread-core-config.h
similarity index 100%
rename from src/platform/bouffalolab/BL702L/bl702l-openthread-core-bl-config.h
rename to src/platform/bouffalolab/BL702L/bl702l-openthread-core-config.h
diff --git a/src/platform/bouffalolab/common/BLConfig.cpp b/src/platform/bouffalolab/common/BflbConfig.cpp
similarity index 78%
rename from src/platform/bouffalolab/common/BLConfig.cpp
rename to src/platform/bouffalolab/common/BflbConfig.cpp
index bac1580f9f7..a2c839f5741 100644
--- a/src/platform/bouffalolab/common/BLConfig.cpp
+++ b/src/platform/bouffalolab/common/BflbConfig.cpp
@@ -18,13 +18,13 @@
 #include <easyflash.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-void BLConfig::Init(void)
+void BflbConfig::Init(void)
 {
     env_node_obj node;
 
@@ -53,7 +53,7 @@ void BLConfig::Init(void)
     }
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint8_t * val, size_t size, size_t & readsize)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint8_t * val, size_t size, size_t & readsize)
 {
     env_node_obj node;
 
@@ -87,25 +87,25 @@ CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint8_t * val, size_t siz
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, bool & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, bool & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, 1, readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint32_t & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint32_t & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, sizeof(val), readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint64_t & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint64_t & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, sizeof(val), readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValueStr(const char * key, char * buf, size_t bufSize, size_t & outLen)
+CHIP_ERROR BflbConfig::ReadConfigValueStr(const char * key, char * buf, size_t bufSize, size_t & outLen)
 {
     size_t readlen = 0;
     if (CHIP_NO_ERROR == ReadConfigValue(key, (uint8_t *) buf, bufSize, readlen))
@@ -122,7 +122,7 @@ CHIP_ERROR BLConfig::ReadConfigValueStr(const char * key, char * buf, size_t buf
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t bufSize, size_t & outLen)
+CHIP_ERROR BflbConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
     size_t readlen = 0;
     if (CHIP_NO_ERROR == ReadConfigValue(key, (uint8_t *) buf, bufSize, readlen))
@@ -134,7 +134,7 @@ CHIP_ERROR BLConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint8_t * val, size_t size)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint8_t * val, size_t size)
 {
     EfErrCode ret = EF_NO_ERR;
 
@@ -169,42 +169,42 @@ CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint8_t * val, size_t si
     }
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, bool val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, bool val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint32_t val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint32_t val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint64_t val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint64_t val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueStr(const char * key, const char * str)
+CHIP_ERROR BflbConfig::WriteConfigValueStr(const char * key, const char * str)
 {
     return WriteConfigValue(key, (uint8_t *) str, strlen(str) + 1);
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueStr(const char * key, const char * str, size_t strLen)
+CHIP_ERROR BflbConfig::WriteConfigValueStr(const char * key, const char * str, size_t strLen)
 {
     return WriteConfigValue(key, (uint8_t *) str, strLen);
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueBin(const char * key, const uint8_t * data, size_t dataLen)
+CHIP_ERROR BflbConfig::WriteConfigValueBin(const char * key, const uint8_t * data, size_t dataLen)
 {
     return WriteConfigValue(key, (uint8_t *) data, dataLen);
 }
 
-CHIP_ERROR BLConfig::ClearConfigValue(const char * key)
+CHIP_ERROR BflbConfig::ClearConfigValue(const char * key)
 {
     return EF_NO_ERR == ef_del_env(key) ? CHIP_NO_ERROR : CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::FactoryResetConfig(void)
+CHIP_ERROR BflbConfig::FactoryResetConfig(void)
 {
     /** set __factory_reset_pending here, let do factory reset operation during startup  */
     ef_set_and_save_env(kBLKey_factoryResetFlag, "pending");
@@ -212,16 +212,16 @@ CHIP_ERROR BLConfig::FactoryResetConfig(void)
     return CHIP_NO_ERROR;
 }
 
-void BLConfig::RunConfigUnitTest() {}
+void BflbConfig::RunConfigUnitTest() {}
 
-bool BLConfig::ConfigValueExists(const char * key)
+bool BflbConfig::ConfigValueExists(const char * key)
 {
     env_node_obj node;
 
     return ef_get_env_obj(key, &node);
 }
 
-CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size, size_t * read_bytes_size, size_t offset_bytes)
+CHIP_ERROR BflbConfig::ReadKVS(const char * key, void * value, size_t value_size, size_t * read_bytes_size, size_t offset_bytes)
 {
     size_t read_len = 0, datalen;
     env_node_obj node;
@@ -274,7 +274,7 @@ CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size,
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::WriteKVS(const char * key, const void * value, size_t value_size)
+CHIP_ERROR BflbConfig::WriteKVS(const char * key, const void * value, size_t value_size)
 {
     EfErrCode ret = EF_NO_ERR;
 
@@ -308,7 +308,7 @@ CHIP_ERROR BLConfig::WriteKVS(const char * key, const void * value, size_t value
     }
 }
 
-CHIP_ERROR BLConfig::ClearKVS(const char * key)
+CHIP_ERROR BflbConfig::ClearKVS(const char * key)
 {
     ef_port_env_lock();
 
diff --git a/src/platform/bouffalolab/common/BLConfig.h b/src/platform/bouffalolab/common/BflbConfig.h
similarity index 99%
rename from src/platform/bouffalolab/common/BLConfig.h
rename to src/platform/bouffalolab/common/BflbConfig.h
index bb9f57fd01b..e74ec7f2b26 100644
--- a/src/platform/bouffalolab/common/BLConfig.h
+++ b/src/platform/bouffalolab/common/BflbConfig.h
@@ -27,7 +27,7 @@ namespace Internal {
  * This class is designed to be mixed-in to concrete implementation classes as a means to
  * provide access to configuration information to generic base classes.
  */
-class BLConfig
+class BflbConfig
 {
 public:
     using Key = const char *;
diff --git a/src/platform/bouffalolab/common/BLConfig_littlefs.cpp b/src/platform/bouffalolab/common/BflbConfig_littlefs.cpp
similarity index 60%
rename from src/platform/bouffalolab/common/BLConfig_littlefs.cpp
rename to src/platform/bouffalolab/common/BflbConfig_littlefs.cpp
index 84b7db21ead..e92aa118600 100644
--- a/src/platform/bouffalolab/common/BLConfig_littlefs.cpp
+++ b/src/platform/bouffalolab/common/BflbConfig_littlefs.cpp
@@ -22,14 +22,14 @@ extern "C" {
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 
-#ifndef BLCONFIG_LFS_NAMESPACE
-#define BLCONFIG_LFS_NAMESPACE "/_blcfg_"
+#ifndef BflbConfig_LFS_NAMESPACE
+#define BflbConfig_LFS_NAMESPACE "/_blcfg_"
 #endif
 
-#ifndef BLCONFIG_SLASH
-#define BLCONFIG_SLASH '-'
+#ifndef BflbConfig_SLASH
+#define BflbConfig_SLASH '-'
 #endif
 
 namespace chip {
@@ -46,9 +46,9 @@ static struct lfs_config lfs_cfg  = {
      .cache_size     = 512,
      .lookahead_size = 256,
 };
-static lfs_t * blconfig_lfs = NULL;
+static lfs_t * BflbConfig_lfs = NULL;
 #else
-static lfs_t * blconfig_lfs = nullptr;
+static lfs_t * BflbConfig_lfs = nullptr;
 #endif
 
 static inline char * blcfg_convert_key(const char * pKey, const char * pNameSpace = NULL)
@@ -93,13 +93,13 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
     struct lfs_info stat;
     lfs_file_t file;
     lfs_dir_t dir            = {};
-    char * factory_reset_key = blcfg_convert_key(BLConfig::kBLKey_factoryResetFlag);
+    char * factory_reset_key = blcfg_convert_key(BflbConfig::kBLKey_factoryResetFlag);
 
     VerifyOrExit(factory_reset_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
-    blconfig_lfs->cfg->lock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->lock(BflbConfig_lfs->cfg);
 
-    ret = lfs_stat(blconfig_lfs, factory_reset_key, &stat);
+    ret = lfs_stat(BflbConfig_lfs, factory_reset_key, &stat);
 
     if (LFS_ERR_OK == ret)
     {
@@ -107,16 +107,16 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
 
         do
         {
-            ret = lfs_file_open(blconfig_lfs, &file, factory_reset_key, LFS_O_RDONLY);
+            ret = lfs_file_open(BflbConfig_lfs, &file, factory_reset_key, LFS_O_RDONLY);
             VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
-            lfs_file_close(blconfig_lfs, &file);
+            lfs_file_close(BflbConfig_lfs, &file);
 
-            ret = lfs_dir_open(blconfig_lfs, &dir, BLCONFIG_LFS_NAMESPACE);
+            ret = lfs_dir_open(BflbConfig_lfs, &dir, BflbConfig_LFS_NAMESPACE);
             VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
             while (1)
             {
-                ret = lfs_dir_read(blconfig_lfs, &dir, &stat);
+                ret = lfs_dir_read(BflbConfig_lfs, &dir, &stat);
                 if (ret <= 0)
                 {
                     break;
@@ -126,10 +126,10 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
                 {
                     continue;
                 }
-                char * delete_key = blcfg_convert_key(stat.name, BLCONFIG_LFS_NAMESPACE);
+                char * delete_key = blcfg_convert_key(stat.name, BflbConfig_LFS_NAMESPACE);
                 VerifyOrExit(delete_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
-                ret = lfs_remove(blconfig_lfs, delete_key);
+                ret = lfs_remove(BflbConfig_lfs, delete_key);
                 free(delete_key);
 
                 if (ret != LFS_ERR_OK)
@@ -138,9 +138,9 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
                 }
             }
 
-            lfs_dir_close(blconfig_lfs, &dir);
+            lfs_dir_close(BflbConfig_lfs, &dir);
 
-            ret = lfs_remove(blconfig_lfs, factory_reset_key);
+            ret = lfs_remove(BflbConfig_lfs, factory_reset_key);
             if (ret != LFS_ERR_OK)
             {
                 break;
@@ -151,7 +151,7 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
     }
 
 exit:
-    blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
     if (factory_reset_key)
     {
         free(factory_reset_key);
@@ -160,27 +160,27 @@ static CHIP_ERROR blcfg_do_factory_reset(void)
     return err;
 }
 
-void BLConfig::Init(void)
+void BflbConfig::Init(void)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     int ret;
     struct lfs_info stat;
 
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-    blconfig_lfs = lfs_xip_init(&lfs_ctx, &lfs_cfg);
+    BflbConfig_lfs = lfs_xip_init(&lfs_ctx, &lfs_cfg);
 #else
-    blconfig_lfs = lfs_xip_init();
+    BflbConfig_lfs = lfs_xip_init();
 #endif
-    VerifyOrExit(blconfig_lfs != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
+    VerifyOrExit(BflbConfig_lfs != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
     /* init namespace */
-    ret = lfs_stat(blconfig_lfs, BLCONFIG_LFS_NAMESPACE, &stat);
+    ret = lfs_stat(BflbConfig_lfs, BflbConfig_LFS_NAMESPACE, &stat);
     if (ret != LFS_ERR_OK)
     {
-        ret = lfs_mkdir(blconfig_lfs, BLCONFIG_LFS_NAMESPACE);
+        ret = lfs_mkdir(BflbConfig_lfs, BflbConfig_LFS_NAMESPACE);
         VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
-        ret = lfs_stat(blconfig_lfs, BLCONFIG_LFS_NAMESPACE, &stat);
+        ret = lfs_stat(BflbConfig_lfs, BflbConfig_LFS_NAMESPACE, &stat);
     }
     VerifyOrExit(ret == LFS_ERR_OK && stat.type == LFS_TYPE_DIR, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
@@ -189,29 +189,29 @@ void BLConfig::Init(void)
     configASSERT(err == CHIP_NO_ERROR);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint8_t * val, size_t size, size_t & readsize)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint8_t * val, size_t size, size_t & readsize)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     int ret        = LFS_ERR_OK;
     lfs_file_t file;
-    char * read_key = blcfg_convert_key(key, BLCONFIG_LFS_NAMESPACE);
+    char * read_key = blcfg_convert_key(key, BflbConfig_LFS_NAMESPACE);
 
     VerifyOrExit(read_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
-    blconfig_lfs->cfg->lock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->lock(BflbConfig_lfs->cfg);
 
-    ret = lfs_file_open(blconfig_lfs, &file, read_key, LFS_O_RDONLY);
+    ret = lfs_file_open(BflbConfig_lfs, &file, read_key, LFS_O_RDONLY);
     VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     if (val && size)
     {
-        ret      = lfs_file_read(blconfig_lfs, &file, val, size);
+        ret      = lfs_file_read(BflbConfig_lfs, &file, val, size);
         readsize = ret;
     }
-    lfs_file_close(blconfig_lfs, &file);
+    lfs_file_close(BflbConfig_lfs, &file);
 
 exit:
-    blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
     if (read_key)
     {
         free(read_key);
@@ -220,25 +220,25 @@ CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint8_t * val, size_t siz
     return err;
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, bool & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, bool & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, 1, readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint32_t & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint32_t & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, sizeof(val), readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValue(const char * key, uint64_t & val)
+CHIP_ERROR BflbConfig::ReadConfigValue(const char * key, uint64_t & val)
 {
     size_t readlen = 0;
     return ReadConfigValue(key, (uint8_t *) &val, sizeof(val), readlen);
 }
 
-CHIP_ERROR BLConfig::ReadConfigValueStr(const char * key, char * buf, size_t bufSize, size_t & outLen)
+CHIP_ERROR BflbConfig::ReadConfigValueStr(const char * key, char * buf, size_t bufSize, size_t & outLen)
 {
     size_t readlen = 0;
     if (CHIP_NO_ERROR == ReadConfigValue(key, (uint8_t *) buf, bufSize, readlen))
@@ -255,7 +255,7 @@ CHIP_ERROR BLConfig::ReadConfigValueStr(const char * key, char * buf, size_t buf
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t bufSize, size_t & outLen)
+CHIP_ERROR BflbConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
     size_t readlen = 0;
     if (CHIP_NO_ERROR == ReadConfigValue(key, (uint8_t *) buf, bufSize, readlen))
@@ -267,25 +267,25 @@ CHIP_ERROR BLConfig::ReadConfigValueBin(const char * key, uint8_t * buf, size_t
     return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint8_t * val, size_t size)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint8_t * val, size_t size)
 {
     int ret        = LFS_ERR_OK;
     CHIP_ERROR err = CHIP_NO_ERROR;
     lfs_file_t file;
-    char * write_key = blcfg_convert_key(key, BLCONFIG_LFS_NAMESPACE);
+    char * write_key = blcfg_convert_key(key, BflbConfig_LFS_NAMESPACE);
 
     VerifyOrExit(write_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
-    blconfig_lfs->cfg->lock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->lock(BflbConfig_lfs->cfg);
 
-    ret = lfs_file_open(blconfig_lfs, &file, write_key, LFS_O_CREAT | LFS_O_RDWR | LFS_O_TRUNC);
+    ret = lfs_file_open(BflbConfig_lfs, &file, write_key, LFS_O_CREAT | LFS_O_RDWR | LFS_O_TRUNC);
     VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
-    lfs_file_write(blconfig_lfs, &file, val, size);
-    lfs_file_close(blconfig_lfs, &file);
+    lfs_file_write(BflbConfig_lfs, &file, val, size);
+    lfs_file_close(BflbConfig_lfs, &file);
 
 exit:
-    blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
     if (write_key)
     {
         free(write_key);
@@ -294,52 +294,52 @@ CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint8_t * val, size_t si
     return err;
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, bool val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, bool val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint32_t val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint32_t val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint64_t val)
+CHIP_ERROR BflbConfig::WriteConfigValue(const char * key, uint64_t val)
 {
     return WriteConfigValue(key, (uint8_t *) &val, sizeof(val));
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueStr(const char * key, const char * str)
+CHIP_ERROR BflbConfig::WriteConfigValueStr(const char * key, const char * str)
 {
     return WriteConfigValue(key, (uint8_t *) str, strlen(str) + 1);
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueStr(const char * key, const char * str, size_t strLen)
+CHIP_ERROR BflbConfig::WriteConfigValueStr(const char * key, const char * str, size_t strLen)
 {
     return WriteConfigValue(key, (uint8_t *) str, strLen);
 }
 
-CHIP_ERROR BLConfig::WriteConfigValueBin(const char * key, const uint8_t * data, size_t dataLen)
+CHIP_ERROR BflbConfig::WriteConfigValueBin(const char * key, const uint8_t * data, size_t dataLen)
 {
     return WriteConfigValue(key, (uint8_t *) data, dataLen);
 }
 
-CHIP_ERROR BLConfig::ClearConfigValue(const char * key)
+CHIP_ERROR BflbConfig::ClearConfigValue(const char * key)
 {
-    char * delete_key = blcfg_convert_key(key, BLCONFIG_LFS_NAMESPACE);
+    char * delete_key = blcfg_convert_key(key, BflbConfig_LFS_NAMESPACE);
 
     if (delete_key == nullptr)
     {
         return CHIP_ERROR_NO_MEMORY;
     }
 
-    int ret = lfs_remove(blconfig_lfs, delete_key);
+    int ret = lfs_remove(BflbConfig_lfs, delete_key);
     free(delete_key);
 
     return (ret >= LFS_ERR_OK || ret == LFS_ERR_NOENT) ? CHIP_NO_ERROR : CHIP_ERROR_PERSISTED_STORAGE_FAILED;
 }
 
-CHIP_ERROR BLConfig::FactoryResetConfig(void)
+CHIP_ERROR BflbConfig::FactoryResetConfig(void)
 {
     int ret = LFS_ERR_OK;
     lfs_file_t file;
@@ -351,44 +351,44 @@ CHIP_ERROR BLConfig::FactoryResetConfig(void)
         return CHIP_ERROR_NO_MEMORY;
     }
 
-    blconfig_lfs->cfg->lock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->lock(BflbConfig_lfs->cfg);
 
-    ret = lfs_file_open(blconfig_lfs, &file, reset_key, LFS_O_CREAT | LFS_O_RDWR | LFS_O_TRUNC);
+    ret = lfs_file_open(BflbConfig_lfs, &file, reset_key, LFS_O_CREAT | LFS_O_RDWR | LFS_O_TRUNC);
     if (ret != LFS_ERR_OK)
     {
-        blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+        BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
         return CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     }
 
-    lfs_file_write(blconfig_lfs, &file, reset_key_value, sizeof(reset_key_value));
-    lfs_file_close(blconfig_lfs, &file);
+    lfs_file_write(BflbConfig_lfs, &file, reset_key_value, sizeof(reset_key_value));
+    lfs_file_close(BflbConfig_lfs, &file);
 
-    blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
     free(reset_key);
 
     return blcfg_do_factory_reset();
 }
 
-void BLConfig::RunConfigUnitTest() {}
+void BflbConfig::RunConfigUnitTest() {}
 
-bool BLConfig::ConfigValueExists(const char * key)
+bool BflbConfig::ConfigValueExists(const char * key)
 {
-    char * exist_key = blcfg_convert_key(key, BLCONFIG_LFS_NAMESPACE);
+    char * exist_key = blcfg_convert_key(key, BflbConfig_LFS_NAMESPACE);
     struct lfs_info stat;
     bool bret;
 
-    bret = (lfs_stat(blconfig_lfs, exist_key, &stat) == LFS_ERR_OK);
+    bret = (lfs_stat(BflbConfig_lfs, exist_key, &stat) == LFS_ERR_OK);
     free(exist_key);
 
     return bret;
 }
 
-CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size, size_t * read_bytes_size, size_t offset_bytes)
+CHIP_ERROR BflbConfig::ReadKVS(const char * key, void * value, size_t value_size, size_t * read_bytes_size, size_t offset_bytes)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     int ret        = LFS_ERR_OK;
     lfs_file_t file;
-    char * read_key = blcfg_convert_key(key, BLCONFIG_LFS_NAMESPACE);
+    char * read_key = blcfg_convert_key(key, BflbConfig_LFS_NAMESPACE);
 
     VerifyOrExit(read_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
@@ -397,9 +397,9 @@ CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size,
         *read_bytes_size = 0;
     }
 
-    blconfig_lfs->cfg->lock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->lock(BflbConfig_lfs->cfg);
 
-    ret = lfs_file_open(blconfig_lfs, &file, read_key, LFS_O_RDONLY);
+    ret = lfs_file_open(BflbConfig_lfs, &file, read_key, LFS_O_RDONLY);
     VerifyOrExit(ret == LFS_ERR_OK, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     if (value && value_size)
@@ -407,12 +407,12 @@ CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size,
         do
         {
             ret = 0;
-            if (offset_bytes > 0 && lfs_file_seek(blconfig_lfs, &file, offset_bytes, 0) < 0)
+            if (offset_bytes > 0 && lfs_file_seek(BflbConfig_lfs, &file, offset_bytes, 0) < 0)
             {
                 err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
                 break;
             }
-            ret = lfs_file_read(blconfig_lfs, &file, value, value_size);
+            ret = lfs_file_read(BflbConfig_lfs, &file, value, value_size);
             if (ret > 0)
             {
                 *read_bytes_size = ret;
@@ -420,9 +420,9 @@ CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size,
         } while (0);
     }
 
-    lfs_file_close(blconfig_lfs, &file);
+    lfs_file_close(BflbConfig_lfs, &file);
 exit:
-    blconfig_lfs->cfg->unlock(blconfig_lfs->cfg);
+    BflbConfig_lfs->cfg->unlock(BflbConfig_lfs->cfg);
     if (read_key)
     {
         free(read_key);
@@ -431,12 +431,12 @@ CHIP_ERROR BLConfig::ReadKVS(const char * key, void * value, size_t value_size,
     return err;
 }
 
-CHIP_ERROR BLConfig::WriteKVS(const char * key, const void * value, size_t value_size)
+CHIP_ERROR BflbConfig::WriteKVS(const char * key, const void * value, size_t value_size)
 {
     return WriteConfigValueBin(key, (const uint8_t *) value, value_size);
 }
 
-CHIP_ERROR BLConfig::ClearKVS(const char * key)
+CHIP_ERROR BflbConfig::ClearKVS(const char * key)
 {
     return ClearConfigValue(key);
 }
diff --git a/src/platform/bouffalolab/common/CHIPDevicePlatformEvent.h b/src/platform/bouffalolab/common/CHIPDevicePlatformEvent.h
index c41a791fec4..653f27417b7 100644
--- a/src/platform/bouffalolab/common/CHIPDevicePlatformEvent.h
+++ b/src/platform/bouffalolab/common/CHIPDevicePlatformEvent.h
@@ -20,11 +20,6 @@
 #include <platform/CHIPDeviceEvent.h>
 #include <system/SystemPacketBuffer.h>
 
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#include <bluetooth/bluetooth.h>
-#include <conn_internal.h>
-#endif
-
 namespace chip {
 namespace DeviceLayer {
 
@@ -57,25 +52,25 @@ enum InternalPlatformSpecificEventTypes
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 struct BleConnEventType
 {
-    bt_conn * BtConn;
+    struct bt_conn * BtConn;
     uint8_t HciResult;
 };
 
 struct BleCCCWriteEventType
 {
-    bt_conn * BtConn;
+    struct bt_conn * BtConn;
     uint16_t Value;
 };
 
 struct BleC1WriteEventType
 {
-    bt_conn * BtConn;
+    struct bt_conn * BtConn;
     ::chip::System::PacketBuffer * Data;
 };
 
 struct BleC2IndDoneEventType
 {
-    bt_conn * BtConn;
+    struct bt_conn * BtConn;
     uint8_t Result;
 };
 
diff --git a/src/platform/bouffalolab/common/CHIPPlatformConfig.h b/src/platform/bouffalolab/common/CHIPPlatformConfig.h
index 94fe3e71558..1b069e05e44 100644
--- a/src/platform/bouffalolab/common/CHIPPlatformConfig.h
+++ b/src/platform/bouffalolab/common/CHIPPlatformConfig.h
@@ -27,7 +27,7 @@ extern "C" void bflb_assert(void);
 #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 BLConfig::kConfigKey_LifeTimeCounter
+#define CHIP_CONFIG_LIFETIIME_PERSISTED_COUNTER_KEY BflbConfig::kConfigKey_LifeTimeCounter
 
 // ==================== Security Adaptations ====================
 #define CHIP_CONFIG_AES_IMPLEMENTATION_OPENSSL 0
diff --git a/src/platform/bouffalolab/common/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/common/ConfigurationManagerImpl.cpp
index 234fbf135ef..7d771634726 100644
--- a/src/platform/bouffalolab/common/ConfigurationManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/ConfigurationManagerImpl.cpp
@@ -29,6 +29,10 @@ extern "C" {
 extern "C" void hal_reboot(void);
 #endif
 
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+extern "C" struct netif * deviceInterface_getNetif(void);
+#endif
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -54,10 +58,10 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
     CHIP_ERROR err;
     uint32_t rebootCount = 0;
 
-    err = Internal::GenericConfigurationManagerImpl<BLConfig>::Init();
+    err = Internal::GenericConfigurationManagerImpl<BflbConfig>::Init();
     SuccessOrExit(err);
 
-    if (BLConfig::ConfigValueExists(BLConfig::kCounterKey_RebootCount))
+    if (BflbConfig::ConfigValueExists(BflbConfig::kCounterKey_RebootCount))
     {
         err = GetRebootCount(rebootCount);
         SuccessOrExit(err);
@@ -69,7 +73,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
     err = StoreRebootCount(rebootCount + 1);
     SuccessOrExit(err);
 
-    if (!BLConfig::ConfigValueExists(BLConfig::kCounterKey_TotalOperationalHours))
+    if (!BflbConfig::ConfigValueExists(BflbConfig::kCounterKey_TotalOperationalHours))
     {
         err = StoreTotalOperationalHours(0);
         SuccessOrExit(err);
@@ -94,27 +98,27 @@ void ConfigurationManagerImpl::InitiateFactoryReset()
 
 CHIP_ERROR ConfigurationManagerImpl::GetRebootCount(uint32_t & rebootCount)
 {
-    return BLConfig::ReadConfigValue(BLConfig::kCounterKey_RebootCount, rebootCount);
+    return BflbConfig::ReadConfigValue(BflbConfig::kCounterKey_RebootCount, rebootCount);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::StoreRebootCount(uint32_t rebootCount)
 {
-    return BLConfig::WriteConfigValue(BLConfig::kCounterKey_RebootCount, rebootCount);
+    return BflbConfig::WriteConfigValue(BflbConfig::kCounterKey_RebootCount, rebootCount);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
 {
-    return ReadConfigValue(BLConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
+    return ReadConfigValue(BflbConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::StoreTotalOperationalHours(uint32_t totalOperationalHours)
 {
-    return WriteConfigValue(BLConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
+    return WriteConfigValue(BflbConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value)
 {
-    BLConfig::Key configKey{ key };
+    BflbConfig::Key configKey{ key };
 
     CHIP_ERROR err = ReadConfigValue(configKey, value);
     if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
@@ -126,68 +130,68 @@ CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform:
 
 CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value)
 {
-    BLConfig::Key configKey{ key };
+    BflbConfig::Key configKey{ key };
     return WriteConfigValue(configKey, value);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, bool & val)
 {
-    return BLConfig::ReadConfigValue(key, val);
+    return BflbConfig::ReadConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint32_t & val)
 {
-    return BLConfig::ReadConfigValue(key, val);
+    return BflbConfig::ReadConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint64_t & val)
 {
-    return BLConfig::ReadConfigValue(key, val);
+    return BflbConfig::ReadConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
 {
-    return BLConfig::ReadConfigValueStr(key, buf, bufSize, outLen);
+    return BflbConfig::ReadConfigValueStr(key, buf, bufSize, outLen);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
-    return BLConfig::ReadConfigValueBin(key, buf, bufSize, outLen);
+    return BflbConfig::ReadConfigValueBin(key, buf, bufSize, outLen);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, bool val)
 {
-    return BLConfig::WriteConfigValue(key, val);
+    return BflbConfig::WriteConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint32_t val)
 {
-    return BLConfig::WriteConfigValue(key, val);
+    return BflbConfig::WriteConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint64_t val)
 {
-    return BLConfig::WriteConfigValue(key, val);
+    return BflbConfig::WriteConfigValue(key, val);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str)
 {
-    return BLConfig::WriteConfigValueStr(key, str);
+    return BflbConfig::WriteConfigValueStr(key, str);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str, size_t strLen)
 {
-    return BLConfig::WriteConfigValueStr(key, str, strLen);
+    return BflbConfig::WriteConfigValueStr(key, str, strLen);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
 {
-    return BLConfig::WriteConfigValueBin(key, data, dataLen);
+    return BflbConfig::WriteConfigValueBin(key, data, dataLen);
 }
 
 void ConfigurationManagerImpl::RunConfigUnitTest(void)
 {
-    BLConfig::RunConfigUnitTest();
+    BflbConfig::RunConfigUnitTest();
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
@@ -211,7 +215,7 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
     ThreadStackMgr().ErasePersistentInfo();
 #endif
 
-    err = BLConfig::FactoryResetConfig();
+    err = BflbConfig::FactoryResetConfig();
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "FactoryResetConfig() failed: %" CHIP_ERROR_FORMAT, err.Format());
@@ -226,6 +230,18 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 #endif
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+CHIP_ERROR ConfigurationManagerImpl::GetPrimaryMACAddress(MutableByteSpan & buf)
+{
+    if (buf.size() != ConfigurationManager::kPrimaryMACAddressLength)
+        return CHIP_ERROR_INVALID_ARGUMENT;
+
+    memcpy(buf.data(), deviceInterface_getNetif()->hwaddr, ConfigurationManager::kPrimaryMACAddressLength);
+
+    return CHIP_NO_ERROR;
+}
+#endif
+
 ConfigurationManager & ConfigurationMgrImpl()
 {
     return ConfigurationManagerImpl::GetDefaultInstance();
diff --git a/src/platform/bouffalolab/common/ConfigurationManagerImpl.h b/src/platform/bouffalolab/common/ConfigurationManagerImpl.h
index afc6ce3842c..79cbf447677 100644
--- a/src/platform/bouffalolab/common/ConfigurationManagerImpl.h
+++ b/src/platform/bouffalolab/common/ConfigurationManagerImpl.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 
 #include <platform/internal/GenericConfigurationManagerImpl.h>
 
@@ -27,7 +27,7 @@ namespace DeviceLayer {
 /**
  * Concrete implementation of the ConfigurationManager singleton object for the Bouffalo Lab platform.
  */
-class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::BLConfig>
+class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::BflbConfig>
 {
 public:
     static ConfigurationManagerImpl & GetDefaultInstance();
diff --git a/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
index 2c8a1c4e85d..966961418f4 100644
--- a/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
@@ -21,7 +21,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/ConnectivityManager.h>
 #include <platform/DiagnosticDataProvider.h>
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 #include <platform/bouffalolab/common/DiagnosticDataProviderImpl.h>
 #include <platform/internal/BLEManager.h>
 
@@ -34,13 +34,13 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 #include <platform/internal/GenericConnectivityManagerImpl_WiFi.ipp>
 #if CHIP_DEVICE_LAYER_TARGET_BL602
-#include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #endif
 #if CHIP_DEVICE_LAYER_TARGET_BL702
-#include <platform/bouffalolab/BL702/NetworkCommissioningDriver.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #endif
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-#include <platform/bouffalolab/BL616/NetworkCommissioningDriver.h>
+#include <platform/bouffalolab/common/NetworkCommissioningDriver.h>
 #endif
 #endif
 
@@ -102,10 +102,10 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned(void)
     size_t ssidLen = 0;
     size_t pskLen  = 0;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, (void *) ssid, 64, &ssidLen, 0);
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiSSID, (void *) ssid, 64, &ssidLen, 0);
     SuccessOrExit(err);
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, (void *) psk, 64, &pskLen, 0);
+    err = PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiPassword, (void *) psk, 64, &pskLen, 0);
     SuccessOrExit(err);
 
     return (ssidLen != 0);
@@ -147,7 +147,7 @@ void ConnectivityManagerImpl::ChangeWiFiStationState(WiFiStationState newState)
         mWiFiStationState = newState;
         ConnectivityMgrImpl().DriveStationState();
         TEMPORARY_RETURN_IGNORED SystemLayer().ScheduleLambda(
-            []() { NetworkCommissioning::BLWiFiDriver::GetInstance().OnNetworkStatusChange(); });
+            []() { NetworkCommissioning::BflbWiFiDriver::GetInstance().OnNetworkStatusChange(); });
     }
 }
 
@@ -155,10 +155,10 @@ void ConnectivityManagerImpl::_ClearWiFiStationProvision(void)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-    err = PersistedStorage::KeyValueStoreMgr().Delete(BLConfig::kConfigKey_WiFiSSID);
+    err = PersistedStorage::KeyValueStoreMgr().Delete(BflbConfig::kConfigKey_WiFiSSID);
     SuccessOrExit(err);
 
-    err = PersistedStorage::KeyValueStoreMgr().Delete(BLConfig::kConfigKey_WiFiPassword);
+    err = PersistedStorage::KeyValueStoreMgr().Delete(BflbConfig::kConfigKey_WiFiPassword);
     SuccessOrExit(err);
 
 exit:
@@ -177,10 +177,11 @@ CHIP_ERROR ConnectivityManagerImpl::ConnectProvisionedWiFiNetwork(void)
     size_t ssidLen = 0;
     size_t pskLen  = 0;
 
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, (void *) ssid, 64, &ssidLen, 0));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, (void *) psk, 64, &pskLen, 0));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiSSID, (void *) ssid, 64, &ssidLen, 0));
+    ReturnErrorOnFailure(
+        PersistedStorage::KeyValueStoreMgr().Get(BflbConfig::kConfigKey_WiFiPassword, (void *) psk, 64, &pskLen, 0));
 
-    return NetworkCommissioning::BLWiFiDriver::GetInstance().ConnectWiFiNetwork(ssid, ssidLen, psk, pskLen);
+    return NetworkCommissioning::BflbWiFiDriver::GetInstance().ConnectWiFiNetwork(ssid, ssidLen, psk, pskLen);
 }
 
 void ConnectivityManagerImpl::OnWiFiStationConnected()
@@ -227,7 +228,7 @@ void ConnectivityManagerImpl::DriveStationState()
         if (ConnectivityManager::kWiFiStationState_Connecting == mWiFiStationState)
         {
             TEMPORARY_RETURN_IGNORED SystemLayer().ScheduleLambda(
-                []() { NetworkCommissioning::BLWiFiDriver::GetInstance().OnConnectWiFiNetwork(false); });
+                []() { NetworkCommissioning::BflbWiFiDriver::GetInstance().OnConnectWiFiNetwork(false); });
         }
     }
     break;
@@ -235,7 +236,7 @@ void ConnectivityManagerImpl::DriveStationState()
         ChipLogProgress(DeviceLayer, "Wi-Fi station connected.");
         OnWiFiStationConnected();
         TEMPORARY_RETURN_IGNORED SystemLayer().ScheduleLambda(
-            []() { NetworkCommissioning::BLWiFiDriver::GetInstance().OnConnectWiFiNetwork(true); });
+            []() { NetworkCommissioning::BflbWiFiDriver::GetInstance().OnConnectWiFiNetwork(true); });
     }
     break;
     case ConnectivityManager::kWiFiStationState_Disconnecting: {
diff --git a/src/platform/bouffalolab/common/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/common/DiagnosticDataProviderImpl.cpp
index 15264565a2f..2aeff9bdcef 100644
--- a/src/platform/bouffalolab/common/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/common/DiagnosticDataProviderImpl.cpp
@@ -24,16 +24,59 @@
 
 #include <FreeRTOS.h>
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-#include <mem.h>
+#include <mm.h>
 #endif
+
 namespace chip {
 namespace DeviceLayer {
 
+extern "C" struct netif * deviceInterface_getNetif(void);
+
+#if CHIP_DEVICE_LAYER_TARGET_BL616
+void get_usage_info(uint64_t & used_size, uint64_t & free_size)
+{
+    uintptr_t irq_flags     = mm_lock_save();
+    mem_manager_t * manager = &g_mem_manager;
+    mm_heap_t * heap;
+    const mm_allocator_t * allocator;
+    struct mm_usage_info usage;
+    int heap_id = 0;
+
+    used_size = free_size = 0;
+    for (heap_id = 0; heap_id < CONFIG_MM_HEAP_COUNT; heap_id++)
+    {
+        if (!manager->initialized)
+        {
+            break;
+        }
+
+        heap = manager->heaps[heap_id];
+        if (!heap || !heap->is_active)
+        {
+            continue;
+        }
+
+        allocator = manager->allocators[heap->allocator_id];
+        if (!allocator || !allocator->get_usage_info)
+        {
+            continue;
+        }
+
+        allocator->get_usage_info(heap, &usage);
+
+        used_size += usage.used_size;
+        free_size += usage.free_size;
+    }
+
+    mm_unlock_restore(irq_flags);
+}
+
+#else
 extern "C" size_t get_heap_size(void);
 #ifdef CFG_USE_PSRAM
 extern "C" size_t get_heap3_size(void);
 #endif
-extern "C" struct netif * deviceInterface_getNetif(void);
+#endif
 
 DiagnosticDataProviderImpl & DiagnosticDataProviderImpl::GetDefaultInstance()
 {
@@ -44,9 +87,8 @@ DiagnosticDataProviderImpl & DiagnosticDataProviderImpl::GetDefaultInstance()
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapFree(uint64_t & currentHeapFree)
 {
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-    struct meminfo info;
-    bflb_mem_usage(KMEM_HEAP, &info);
-    currentHeapFree = info.free_size;
+    uint64_t used_size;
+    get_usage_info(used_size, currentHeapFree);
 #else
 #ifdef CFG_USE_PSRAM
     currentHeapFree = xPortGetFreeHeapSize() + xPortGetFreeHeapSizePsram();
@@ -61,9 +103,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapFree(uint64_t & currentHeap
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapUsed(uint64_t & currentHeapUsed)
 {
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-    struct meminfo info;
-    bflb_mem_usage(KMEM_HEAP, &info);
-    currentHeapUsed = info.total_size - info.free_size;
+    uint64_t free_size;
+    get_usage_info(currentHeapUsed, free_size);
 #else
 #ifdef CFG_USE_PSRAM
     currentHeapUsed = (get_heap_size() + get_heap3_size() - xPortGetFreeHeapSize() - xPortGetFreeHeapSizePsram());
@@ -78,10 +119,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapUsed(uint64_t & currentHeap
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark)
 {
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-    struct meminfo info;
-    bflb_mem_usage(KMEM_HEAP, &info);
-    currentHeapHighWatermark = info.total_size - info.max_free_size;
-
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 #else
 #ifdef CFG_USE_PSRAM
     currentHeapHighWatermark =
@@ -89,9 +127,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
 #else
     currentHeapHighWatermark = get_heap_size() - xPortGetMinimumEverFreeHeapSize();
 #endif
-#endif
-
     return CHIP_NO_ERROR;
+#endif
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadMetricsOut)
@@ -231,7 +268,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMax
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface ** netifpp)
 {
-    NetworkInterface * ifp = new NetworkInterface();
+    auto ifp = std::make_unique<NetworkInterface>();
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     const char * threadNetworkName = otThreadGetNetworkName(ThreadStackMgrImpl().OTInstance());
@@ -240,12 +277,16 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
     ifp->type = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::kThread;
-    uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
-    TEMPORARY_RETURN_IGNORED ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
-    ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
+    TEMPORARY_RETURN_IGNORED ConfigurationMgr().GetPrimary802154MACAddress(ifp->MacAddress);
+    ifp->hardwareAddress = ByteSpan(ifp->MacAddress, sizeof(ifp->MacAddress));
 #else
 
     struct netif * netif = deviceInterface_getNetif();
+    if (netif == nullptr)
+    {
+        *netifpp = nullptr;
+        return CHIP_ERROR_NOT_FOUND;
+    }
 
     Platform::CopyString(ifp->Name, netif->name);
     ifp->name          = CharSpan::fromCharString(ifp->Name);
@@ -257,27 +298,43 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
 #endif
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
-
     memcpy(ifp->MacAddress, netif->hwaddr, sizeof(netif->hwaddr));
     ifp->hardwareAddress = ByteSpan(ifp->MacAddress, sizeof(netif->hwaddr));
+#endif
 
-    memcpy(ifp->Ipv4AddressesBuffer[0], netif_ip_addr4(netif), kMaxIPv4AddrSize);
-    ifp->Ipv4AddressSpans[0] = ByteSpan(ifp->Ipv4AddressesBuffer[0], kMaxIPv4AddrSize);
-    ifp->IPv4Addresses       = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv4AddressSpans, 1);
-
-    int addr_count = 0;
-    for (size_t i = 0; (i < LWIP_IPV6_NUM_ADDRESSES) && (i < kMaxIPv6AddrCount); i++)
+    // IPv6-only support
+    Inet::InterfaceAddressIterator interfAddrIterator;
+    uint32_t ipv6AddressesCount = 0, ipv4AddressesCount = 0;
+    chip::Inet::IPAddress ipAddress;
+    while (interfAddrIterator.HasCurrent())
     {
-        if (!ip6_addr_isany(&(netif->ip6_addr[i].u_addr.ip6)))
+        if (interfAddrIterator.GetAddress(ipAddress) == CHIP_NO_ERROR)
         {
-            memcpy(ifp->Ipv6AddressesBuffer[addr_count], &(netif->ip6_addr[i].u_addr.ip6), sizeof(ip6_addr_t));
-            ifp->Ipv6AddressSpans[addr_count] = ByteSpan(ifp->Ipv6AddressesBuffer[addr_count], kMaxIPv6AddrSize);
+            if (ipAddress.IsIPv4())
+            {
+                if (ipv4AddressesCount < kMaxIPv4AddrCount)
+                {
+                    memcpy(ifp->Ipv4AddressesBuffer[ipv4AddressesCount], ipAddress.Addr, kMaxIPv4AddrSize);
+                    ifp->Ipv4AddressSpans[ipv4AddressesCount] = ByteSpan(ifp->Ipv4AddressesBuffer[ipv4AddressesCount]);
+                    ipv4AddressesCount++;
+                }
+            }
+            else
+            {
+                if (ipv6AddressesCount < kMaxIPv6AddrCount)
+                {
+                    memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipAddress.Addr, kMaxIPv6AddrSize);
+                    ifp->Ipv6AddressSpans[ipv6AddressesCount] = ByteSpan(ifp->Ipv6AddressesBuffer[ipv6AddressesCount]);
+                    ipv6AddressesCount++;
+                }
+            }
         }
+        interfAddrIterator.Next();
     }
-    ifp->IPv6Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv6AddressSpans, addr_count);
-#endif
+    ifp->IPv4Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv4AddressSpans, ipv4AddressesCount);
+    ifp->IPv6Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv6AddressSpans, ipv6AddressesCount);
 
-    *netifpp = ifp;
+    *netifpp = ifp.release();
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/bouffalolab/common/KeyValueStoreManagerImpl.cpp b/src/platform/bouffalolab/common/KeyValueStoreManagerImpl.cpp
index 94dfb678c11..0b3f85b9742 100644
--- a/src/platform/bouffalolab/common/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/KeyValueStoreManagerImpl.cpp
@@ -22,7 +22,7 @@
 
 #include <platform/KeyValueStoreManager.h>
 
-#include <platform/bouffalolab/common/BLConfig.h>
+#include <platform/bouffalolab/common/BflbConfig.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -37,7 +37,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
 {
     VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT);
 
-    CHIP_ERROR err = BLConfig::ReadKVS(key, value, value_size, read_bytes_size, offset_bytes);
+    CHIP_ERROR err = BflbConfig::ReadKVS(key, value, value_size, read_bytes_size, offset_bytes);
     if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
     {
         err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
@@ -49,12 +49,12 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value,
 {
     VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT);
 
-    return BLConfig::WriteKVS(key, value, value_size);
+    return BflbConfig::WriteKVS(key, value, value_size);
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 {
-    return BLConfig::ClearKVS((char *) key);
+    return BflbConfig::ClearKVS((char *) key);
 }
 
 } // namespace PersistedStorage
diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h b/src/platform/bouffalolab/common/NetworkCommissioningDriver.h
similarity index 62%
rename from src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h
rename to src/platform/bouffalolab/common/NetworkCommissioningDriver.h
index b98ea60ab61..d2a04d9d3fe 100644
--- a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h
+++ b/src/platform/bouffalolab/common/NetworkCommissioningDriver.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <pkg_protocol.h>
 #include <platform/NetworkCommissioning.h>
 
 namespace chip {
@@ -26,51 +25,63 @@ namespace NetworkCommissioning {
 
 void NetworkEventHandler(const ChipDeviceEvent * event, intptr_t arg);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 namespace {
 inline constexpr uint8_t kMaxWiFiNetworks                  = 1;
 inline constexpr uint8_t kWiFiScanNetworksTimeOutSeconds   = 10;
 inline constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 20;
 } // namespace
 
-class BLScanResponseIterator : public Iterator<WiFiScanResponse>
+template <typename RawType, typename Converter>
+class BflbScanResponseIterator : public Iterator<WiFiScanResponse>
 {
 public:
-    BLScanResponseIterator(size_t size, WiFiScanResponse * pScanResults) : mSize(size), mpScanResults(pScanResults) {}
+    BflbScanResponseIterator(size_t size, const RawType * pScanResults, Converter conv) :
+        mSize(size), mpRawResults(pScanResults), mConvert(std::move(conv))
+    {}
     size_t Count() override { return mSize; }
+    void Release() override {}
+
     bool Next(WiFiScanResponse & item) override
     {
-        if (mIternum >= mSize)
+        if (mIternum >= mSize || mpRawResults == nullptr)
         {
             return false;
         }
 
-        memcpy(&item, mpScanResults + mIternum, sizeof(WiFiScanResponse));
-
-        mIternum++;
+        item = mConvert(mpRawResults[mIternum]);
+        ++mIternum;
         return true;
     }
-    void Release() override {}
 
 private:
     const size_t mSize;
-    const WiFiScanResponse * mpScanResults;
     size_t mIternum = 0;
+
+    const RawType * mpRawResults;
+    Converter mConvert;
 };
 
-class BLWiFiDriver final : public WiFiDriver
+template <typename RawType, typename Converter>
+auto makeBflbScanIterator(size_t count, const RawType * results, Converter && conv)
+{
+    return BflbScanResponseIterator<RawType, std::decay_t<Converter>>(count, results, std::forward<Converter>(conv));
+}
+
+class BflbWiFiDriver final : public WiFiDriver
 {
 public:
     class WiFiNetworkIterator final : public NetworkIterator
     {
     public:
-        WiFiNetworkIterator(BLWiFiDriver * aDriver) : mDriver(aDriver) {}
+        WiFiNetworkIterator(BflbWiFiDriver * aDriver) : mDriver(aDriver) {}
         size_t Count() override;
         bool Next(Network & item) override;
         void Release() override { delete this; }
         ~WiFiNetworkIterator() = default;
 
     private:
-        BLWiFiDriver * mDriver;
+        BflbWiFiDriver * mDriver;
         bool mExhausted = false;
     };
 
@@ -89,6 +100,7 @@ class BLWiFiDriver final : public WiFiDriver
         kMaxWPAPSK = 63,
         kWPAPSKHex = 64,
     };
+
     // BaseDriver
     NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
     CHIP_ERROR Init(NetworkStatusChangeCallback * networkStatusChangeCallback) override;
@@ -114,23 +126,25 @@ class BLWiFiDriver final : public WiFiDriver
     CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
     void OnConnectWiFiNetwork(bool isConnected);
     void OnScanWiFiNetworkDone(void);
-    void OnScanWiFiNetworkDone(void * opaque);
     void OnNetworkStatusChange(void);
-
     CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
+
+    void OnScanWiFiNetworkDone(void * opaque);
     int32_t GetLastDisconnectReason();
 
-    static BLWiFiDriver & GetInstance()
+    static BflbWiFiDriver & GetInstance()
     {
-        static BLWiFiDriver instance;
+        static BflbWiFiDriver instance;
         return instance;
     }
 
 private:
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
 
+#if CHIP_DEVICE_LAYER_TARGET_BL702
     WiFiScanResponse * mScanResponse = nullptr;
     size_t mScanResponseNum          = 0;
+#endif
 
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
@@ -139,10 +153,52 @@ class BLWiFiDriver final : public WiFiDriver
     NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
     int32_t mLastDisconnectedReason;
 
-    /** +1 byte for string termination */
-    char mScanSSID[chip::DeviceLayer::Internal::kMaxWiFiSSIDLength + 1];
-    bool mScanSpecific = false;
+    char mScanSSID[DeviceLayer::Internal::kMaxWiFiSSIDLength];
+    int mScanSSIDlength;
+};
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
+class BflbEthernetDriver final : public EthernetDriver
+{
+public:
+    struct EthernetNetworkIterator final : public NetworkIterator
+    {
+        EthernetNetworkIterator() = default;
+        size_t Count() override { return interfaceNameLen > 0 ? 1 : 0; }
+        bool Next(Network & item) override
+        {
+            if (exhausted)
+            {
+                return false;
+            }
+            exhausted = true;
+            memcpy(item.networkID, interfaceName, interfaceNameLen);
+            item.networkIDLen = interfaceNameLen;
+            item.connected    = true;
+            return true;
+        }
+        void Release() override { delete this; }
+        ~EthernetNetworkIterator() override = default;
+
+        // Public, but cannot be accessed via NetworkIterator interface.
+        uint8_t interfaceName[kMaxNetworkIDLen];
+        uint8_t interfaceNameLen = 0;
+        bool exhausted           = false;
+    };
+
+    uint8_t GetMaxNetworks() override { return 1; };
+    NetworkIterator * GetNetworks() override;
+    CHIP_ERROR Init(BaseDriver::NetworkStatusChangeCallback * networkStatusChangeCallback) override;
+    void Shutdown() override;
+
+    static BflbEthernetDriver & GetInstance()
+    {
+        static BflbEthernetDriver instance;
+        return instance;
+    }
 };
+#endif
 
 } // namespace NetworkCommissioning
 } // namespace DeviceLayer
diff --git a/src/platform/bouffalolab/common/OTAImageProcessorImpl_bflb.cpp b/src/platform/bouffalolab/common/OTAImageProcessorImpl_bflb.cpp
index b8ecfefc8cd..e0eaf6269bd 100644
--- a/src/platform/bouffalolab/common/OTAImageProcessorImpl_bflb.cpp
+++ b/src/platform/bouffalolab/common/OTAImageProcessorImpl_bflb.cpp
@@ -99,25 +99,25 @@ CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
 
 CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
 {
-    DeviceLayer::PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Finalize()
 {
-    DeviceLayer::PlatformMgr().ScheduleWork(HandleFinalize, reinterpret_cast<intptr_t>(this));
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgr().ScheduleWork(HandleFinalize, reinterpret_cast<intptr_t>(this));
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Apply()
 {
-    DeviceLayer::PlatformMgr().ScheduleWork(HandleApply, reinterpret_cast<intptr_t>(this));
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgr().ScheduleWork(HandleApply, reinterpret_cast<intptr_t>(this));
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Abort()
 {
-    DeviceLayer::PlatformMgr().ScheduleWork(HandleAbort, reinterpret_cast<intptr_t>(this));
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgr().ScheduleWork(HandleAbort, reinterpret_cast<intptr_t>(this));
     return CHIP_NO_ERROR;
 }
 
@@ -135,7 +135,7 @@ CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
         ChipLogError(SoftwareUpdate, "Cannot set block data: %" CHIP_ERROR_FORMAT, err.Format());
     }
 
-    DeviceLayer::PlatformMgr().ScheduleWork(HandleProcessBlock, reinterpret_cast<intptr_t>(this));
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgr().ScheduleWork(HandleProcessBlock, reinterpret_cast<intptr_t>(this));
     return CHIP_NO_ERROR;
 }
 
@@ -161,7 +161,7 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
     memset(&(imageProcessor->mOtaHdr), 0, sizeof(ota_header_s_t));
     imageProcessor->mImageTotalSize = 0;
 
-    imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
+    TEMPORARY_RETURN_IGNORED imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
 }
 
 void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
@@ -192,7 +192,7 @@ void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
         ChipLogProgress(SoftwareUpdate, "OTA image downloaded");
     }
 
-    imageProcessor->ReleaseBlock();
+    TEMPORARY_RETURN_IGNORED imageProcessor->ReleaseBlock();
 }
 
 void OTAImageProcessorImpl::HandleApply(intptr_t context)
@@ -225,7 +225,7 @@ void OTAImageProcessorImpl::HandleAbort(intptr_t context)
 
     bflb_ota_abort();
 
-    imageProcessor->ReleaseBlock();
+    TEMPORARY_RETURN_IGNORED imageProcessor->ReleaseBlock();
 }
 
 void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
@@ -326,7 +326,7 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
         imageProcessor->mParams.downloadedBytes += block.size();
     }
 
-    imageProcessor->mDownloader->FetchNextData();
+    TEMPORARY_RETURN_IGNORED imageProcessor->mDownloader->FetchNextData();
 }
 
 // Store block data for HandleProcessBlock to access
@@ -340,7 +340,7 @@ CHIP_ERROR OTAImageProcessorImpl::SetBlock(ByteSpan & block)
     // Allocate memory for block data if we don't have enough already
     if (mBlock.size() < block.size())
     {
-        ReleaseBlock();
+        TEMPORARY_RETURN_IGNORED ReleaseBlock();
 
         mBlock = MutableByteSpan(static_cast<uint8_t *>(chip::Platform::MemoryAlloc(block.size())), block.size());
         if (mBlock.data() == nullptr)
diff --git a/src/platform/bouffalolab/common/PlatformManagerImpl.cpp b/src/platform/bouffalolab/common/PlatformManagerImpl.cpp
index 27912a97c27..d712ecd1eec 100644
--- a/src/platform/bouffalolab/common/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/PlatformManagerImpl.cpp
@@ -17,7 +17,6 @@
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-#include <platform/FreeRTOS/SystemTimeSupport.h>
 #include <platform/PlatformManager.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
diff --git a/src/platform/bouffalolab/common/SystemPlatformConfig.h b/src/platform/bouffalolab/common/SystemPlatformConfig.h
index 5802b386225..6f42b59a6b2 100644
--- a/src/platform/bouffalolab/common/SystemPlatformConfig.h
+++ b/src/platform/bouffalolab/common/SystemPlatformConfig.h
@@ -36,10 +36,13 @@ struct ChipDeviceEvent;
 
 #if CHIP_DEVICE_LAYER_TARGET_BL616
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(mbedtls_sha256_context) in hw_acc/sha256_alt.h
-#define CHIP_CONFIG_SHA256_CONTEXT_SIZE (32 + 64 + 64 + 19 * 32)
+#define CHIP_CONFIG_SHA256_CONTEXT_SIZE (32 + 32 + 64 + 64 + 3 * 32)
 #define CHIP_CONFIG_SHA256_CONTEXT_ALIGN 32
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM 1
 #else
-
+#if CHIP_DEVICE_LAYER_TARGET_BL602
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM 1
+#endif
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t)
 #define CHIP_CONFIG_SHA256_CONTEXT_SIZE ((7 + 1 + 5 + 18 + 16 + 16 + 7) * sizeof(unsigned int))
 #endif
diff --git a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/common/ThreadStackManagerImpl.cpp
similarity index 94%
rename from src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
rename to src/platform/bouffalolab/common/ThreadStackManagerImpl.cpp
index a2072eff6be..96099cd66f3 100644
--- a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/ThreadStackManagerImpl.cpp
@@ -54,7 +54,9 @@ CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
     err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
     SuccessOrExit(err);
 
+#if CHIP_DEVICE_LAYER_TARGET_BL702 || CHIP_DEVICE_LAYER_TARGET_BL702L
     mbedtls_platform_set_calloc_free(pvPortCalloc, vPortFree);
+#endif
 
 exit:
     return err;
@@ -109,6 +111,16 @@ extern "C" otInstance * otrGetInstance()
     return ThreadStackMgrImpl().OTInstance();
 }
 
+extern "C" void otrLock(void)
+{
+    ThreadStackMgrImpl().LockThreadStack();
+}
+
+extern "C" void otrUnlock(void)
+{
+    ThreadStackMgrImpl().UnlockThreadStack();
+}
+
 extern "C" uint32_t otrEnterCrit(void)
 {
     if (xPortIsInsideInterrupt())
diff --git a/src/platform/nxp/common/crypto/SecLibSpake2p.cpp b/src/platform/nxp/common/crypto/SecLibSpake2p.cpp
new file mode 100644
index 00000000000..4a3dda0cfda
--- /dev/null
+++ b/src/platform/nxp/common/crypto/SecLibSpake2p.cpp
@@ -0,0 +1,230 @@
+/*
+ *
+ *    Copyright (c) 2026 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
+ *      Custom SPAKE2P implementation for PSA Crypto
+ */
+
+#include "SecLib_ecp256.h"
+#include <crypto/CHIPCryptoPAL.h>
+namespace chip {
+namespace Crypto {
+
+typedef struct Spake2p_Context
+{
+    ecp256Point_t M;
+    ecp256Point_t N;
+    ecp256Point_t X;
+    ecp256Point_t Y;
+    ecp256Point_t L;
+    ecp256Point_t Z;
+    ecp256Point_t V;
+
+    big_int256_t w0;
+    big_int256_t w1;
+    big_int256_t xy;
+    big_int256_t tempbn;
+
+} Spake2p_Context;
+
+static inline Spake2p_Context * to_inner_spake2p_context(Spake2pOpaqueContext * context)
+{
+    return SafePointerCast<Spake2p_Context *>(context);
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
+{
+    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
+    memset(context, 0, sizeof(Spake2p_Context));
+
+    M = &context->M;
+    N = &context->N;
+    X = &context->X;
+    Y = &context->Y;
+    L = &context->L;
+    V = &context->V;
+    Z = &context->Z;
+
+    w0     = &context->w0;
+    w1     = &context->w1;
+    xy     = &context->xy;
+    tempbn = &context->tempbn;
+
+    return CHIP_NO_ERROR;
+}
+
+void Spake2p_P256_SHA256_HKDF_HMAC::Clear()
+{
+    VerifyOrReturn(state != CHIP_SPAKE2P_STATE::PREINIT);
+
+    state = CHIP_SPAKE2P_STATE::PREINIT;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::Mac(const uint8_t * key, size_t key_len, const uint8_t * in, size_t in_len,
+                                              MutableByteSpan & out_span)
+{
+    HMAC_sha hmac;
+    VerifyOrReturnError(out_span.size() >= kSHA256_Hash_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
+    ReturnErrorOnFailure(hmac.HMAC_SHA256(key, key_len, in, in_len, out_span.data(), kSHA256_Hash_Length));
+    out_span = out_span.SubSpan(0, kSHA256_Hash_Length);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::MacVerify(const uint8_t * key, size_t key_len, const uint8_t * mac, size_t mac_len,
+                                                    const uint8_t * in, size_t in_len)
+{
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result       = 0;
+
+    uint8_t computed_mac[kSHA256_Hash_Length];
+    MutableByteSpan computed_mac_span{ computed_mac };
+    VerifyOrExit(mac_len == kSHA256_Hash_Length, error = CHIP_ERROR_INVALID_ARGUMENT);
+
+    SuccessOrExit(error = Mac(key, key_len, in, in_len, computed_mac_span));
+    VerifyOrExit(computed_mac_span.size() == mac_len, error = CHIP_ERROR_INTERNAL);
+
+    VerifyOrExit(IsBufferContentEqualConstantTime(mac, computed_mac, kSHA256_Hash_Length), error = CHIP_ERROR_INTERNAL);
+
+exit:
+    return error;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FELoad(const uint8_t * in, size_t in_len, void * fe)
+{
+    secEcp256Status_t result;
+    uint32_t FE[SEC_ECP256_COORDINATE_WLEN];
+
+    result = ECP256_ModularReductionN(FE, in, in_len);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    result = ECP256_FieldLoad((uint32_t *) fe, (const uint8_t *) FE, in_len);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEWrite(const void * fe, uint8_t * out, size_t out_len)
+{
+    secEcp256Status_t result;
+
+    result = ECP256_FieldWrite(out, (uint8_t *) fe);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEGenerate(void * fe)
+{
+    secEcp256Status_t result;
+    big_int256_t PrivateKey;
+
+    result = ECP256_GeneratePrivateKey(&PrivateKey);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    result = ECP256_FieldWrite((uint8_t *) fe, (uint8_t *) &PrivateKey);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEMul(void * fer, const void * fe1, const void * fe2)
+{
+    secEcp256Status_t result;
+
+    result = ECP256_ScalarMultiplicationModN((uint32_t *) fer, (const uint32_t *) fe1, (const uint32_t *) fe2);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointLoad(const uint8_t * in, size_t in_len, void * R)
+{
+    ECP256_PointLoad((ecp256Point_t *) R, in, false);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointWrite(const void * R, uint8_t * out, size_t out_len)
+{
+    ECP256_PointWrite(out, (ecp256Point_t *) R, false);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointMul(void * R, const void * P1, const void * fe1)
+{
+    secEcp256Status_t result;
+
+    result = ECP256_PointMult((ecp256Point_t *) R, (const uint8_t *) P1, (const uint8_t *) fe1);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointAddMul(void * R, const void * P1, const void * fe1, const void * P2,
+                                                      const void * fe2)
+{
+    secEcp256Status_t result;
+
+    result = ECP256_DoublePointMulAdd(R, P1, fe1, P2, fe2);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointInvert(void * R)
+{
+    secEcp256Status_t result;
+
+    result = ECP256_PointInvert((uint32_t *) R, (const uint32_t *) R);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointCofactorMul(void * R)
+{
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::ComputeL(uint8_t * Lout, size_t * L_len, const uint8_t * w1sin, size_t w1sin_len)
+{
+    secEcp256Status_t result;
+    ecp256Point_t gen_point;
+    uint32_t W1[SEC_ECP256_COORDINATE_WLEN];
+
+    result = ECP256_ModularReductionN(W1, w1sin, w1sin_len);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    result = ECP256_GeneratePublicKey((uint8_t *) &gen_point, (uint8_t *) &W1, NULL);
+    VerifyOrReturnError(result == gSecEcp256Success_c, CHIP_ERROR_INTERNAL);
+
+    ECP256_PointWrite(Lout, (ecp256Point_t *) &gen_point, false);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
+{
+    VerifyOrReturnError(ECP256_PointValid((ecp256Point_t *) R), CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace Crypto
+} // namespace chip
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp
index 287508c3538..31e346298b0 100644
--- a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp
+++ b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp
@@ -22,8 +22,6 @@
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 CHIP_ERROR FactoryDataProviderImpl::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                                                 uint32_t * contentAddr)
 {
@@ -112,10 +110,13 @@ CHIP_ERROR FactoryDataProviderImpl::SetEncryptionMode(EncryptionMode mode)
     return error;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h
index e8a957d683f..ac8f103fae0 100644
--- a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h
+++ b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h
@@ -34,8 +34,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                            uint32_t * contentAddr = NULL);
     ~FactoryDataProviderImpl(){};
diff --git a/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.cpp b/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.cpp
index 28ad8e7362a..6bc28fbc2ff 100644
--- a/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.cpp
+++ b/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.cpp
@@ -34,8 +34,6 @@ static constexpr size_t kPrivateKeyBlobLength  = Crypto::kP256_PrivateKey_Length
 
 uint32_t FactoryDataProvider::kFactoryDataMaxSize = 0x800;
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 FactoryDataProviderImpl::FactoryDataProviderImpl()
 {
 #if CONFIG_CHIP_OTA_FACTORY_DATA_PROCESSOR
@@ -354,10 +352,13 @@ void FactoryDataProviderImpl::SSS_RunApiTest()
 #endif // CHIP_DEVICE_CONFIG_ENABLE_SSS_API_TEST
 #endif // CHIP_USE_PLAIN_DAC_KEY
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.h b/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.h
index 7c4eb09d166..e8368e90413 100644
--- a/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.h
+++ b/src/platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.h
@@ -47,8 +47,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     FactoryDataProviderImpl();
     ~FactoryDataProviderImpl();
 
diff --git a/src/platform/nxp/crypto/se05x/BUILD.gn b/src/platform/nxp/crypto/se05x/BUILD.gn
index 009bd18a9e8..f87e8825be4 100644
--- a/src/platform/nxp/crypto/se05x/BUILD.gn
+++ b/src/platform/nxp/crypto/se05x/BUILD.gn
@@ -31,22 +31,23 @@ if (chip_crypto == "platform") {
 
 static_library("nxp_crypto_lib") {
   sources = [
-    "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHost.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hkdf.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hmac.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_pbkdf.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_rng.cpp",
+    "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_HostFallBack.cpp",
     "${chip_root}/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.cpp",
   ]
 
-  if (nxp_platform == "rt/rw61x") {
+  if (chip_device_platform == "linux" || nxp_platform == "rt/rw61x" ||
+      nxp_platform == "rt/rt1060") {
     sources += [
-      "${chip_root}/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample.cpp",
-      "${chip_root}/src/credentials/examples/ExampleDACs.h",
-      "${chip_root}/src/credentials/examples/ExamplePAI.h",
+      "${chip_root}/src/crypto/CHIPCryptoPALmbedTLS.cpp",
+      "${chip_root}/src/crypto/CHIPCryptoPALmbedTLS.h",
+      "${chip_root}/src/crypto/CHIPCryptoPALmbedTLSCert.cpp",
     ]
   }
 
@@ -70,29 +71,21 @@ static_library("nxp_crypto_lib") {
       defines += [ "ENABLE_SE05X_RND_GEN=1" ]
     }
 
-    if (chip_se05x_gen_ec_key) {
-      defines += [ "ENABLE_SE05X_GENERATE_EC_KEY=1" ]
-    }
-
-    if (chip_se05x_ecdsa_verify) {
-      defines += [ "ENABLE_SE05X_ECDSA_VERIFY=1" ]
-    }
-
-    if (chip_se05x_pbkdf2_sha256) {
-      defines += [ "ENABLE_SE05X_PBKDF2_SHA256=1" ]
+    if (chip_se05x_device_attestation) {
+      defines += [ "ENABLE_SE05X_DEVICE_ATTESTATION=1" ]
     }
 
-    if (chip_se05x_hkdf_sha256) {
-      defines += [ "ENABLE_SE05X_HKDF_SHA256=1" ]
+    if (chip_se05x_spake_verifier_use_tp_values) {
+      defines += [ "ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES=1" ]
     }
 
-    if (chip_se05x_hmac_sha256) {
-      defines += [ "ENABLE_SE05X_HMAC_SHA256=1" ]
-    }
+    defines += [
+      "SE05X_SPAKE_VERIFIER_TP_SET_NO=$chip_se05x_spake_verifier_tp_set_no",
+    ]
 
-    if (chip_se05x_device_attestation) {
-      defines += [ "ENABLE_SE05X_DEVICE_ATTESTATION=1" ]
-    }
+    defines += [
+      "SE05X_SPAKE_VERIFIER_TP_ITER_CNT=$chip_se05x_spake_verifier_tp_iter_cnt",
+    ]
   }
 
   external_mbedtls = current_os == "zephyr" || nxp_external_sdk
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHost.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHost.cpp
deleted file mode 100644
index ea5150b7193..00000000000
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHost.cpp
+++ /dev/null
@@ -1,1355 +0,0 @@
-/*
- *
- *    Copyright (c) 2020-2022, 2025 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
- *      mbedTLS based implementation of CHIP crypto primitives
- */
-
-#include <crypto/CHIPCryptoPAL.h>
-
-#include <type_traits>
-
-#include <mbedtls/bignum.h>
-#include <mbedtls/ccm.h>
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/ecdh.h>
-#include <mbedtls/ecdsa.h>
-#include <mbedtls/ecp.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/error.h>
-#include <mbedtls/hkdf.h>
-#include <mbedtls/md.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/sha1.h>
-#include <mbedtls/sha256.h>
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-#include <mbedtls/x509_crt.h>
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-#include <mbedtls/oid.h>
-#include <mbedtls/version.h>
-#include <mbedtls/x509.h>
-#include <mbedtls/x509_csr.h>
-
-#include <lib/core/CHIPSafeCasts.h>
-#include <lib/support/BufferWriter.h>
-#include <lib/support/BytesToHex.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/SafeInt.h>
-#include <lib/support/SafePointerCast.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-#include <string.h>
-
-namespace chip {
-namespace Crypto {
-
-#define MAX_ERROR_STR_LEN 128
-#define NUM_BYTES_IN_SHA256_HASH 32
-
-// In mbedTLS 3.0.0 direct access to structure fields was replaced with using MBEDTLS_PRIVATE macro.
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-#define CHIP_CRYPTO_PAL_PRIVATE(x) MBEDTLS_PRIVATE(x)
-#else
-#define CHIP_CRYPTO_PAL_PRIVATE(x) x
-#endif
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000 && MBEDTLS_VERSION_NUMBER < 0x03010000)
-#define CHIP_CRYPTO_PAL_PRIVATE_X509(x) MBEDTLS_PRIVATE(x)
-#else
-#define CHIP_CRYPTO_PAL_PRIVATE_X509(x) x
-#endif
-
-typedef struct
-{
-    bool mInitialized;
-    bool mDRBGSeeded;
-    mbedtls_ctr_drbg_context mDRBGCtxt;
-    mbedtls_entropy_context mEntropy;
-} EntropyContext;
-
-static EntropyContext gsEntropyContext;
-
-static void _log_mbedTLS_error(int error_code)
-{
-    if (error_code != 0)
-    {
-#if defined(MBEDTLS_ERROR_C)
-        char error_str[MAX_ERROR_STR_LEN];
-        mbedtls_strerror(error_code, error_str, sizeof(error_str));
-        ChipLogError(Crypto, "mbedTLS error: %s", error_str);
-#else
-        // Error codes defined in 16-bit negative hex numbers. Ease lookup by printing likewise
-        ChipLogError(Crypto, "mbedTLS error: -0x%04X", -static_cast<uint16_t>(error_code));
-#endif
-    }
-}
-
-static bool _isValidTagLength(size_t tag_length)
-{
-    if (tag_length == 8 || tag_length == 12 || tag_length == 16)
-    {
-        return true;
-    }
-    return false;
-}
-
-CHIP_ERROR AES_CCM_encrypt(const uint8_t * plaintext, size_t plaintext_length, const uint8_t * aad, size_t aad_length,
-                           const Aes128KeyHandle & key, const uint8_t * nonce, size_t nonce_length, uint8_t * ciphertext,
-                           uint8_t * tag, size_t tag_length)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 1;
-
-    mbedtls_ccm_context context;
-    mbedtls_ccm_init(&context);
-
-    VerifyOrExit(plaintext != nullptr || plaintext_length == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(ciphertext != nullptr || plaintext_length == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(nonce != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(nonce_length > 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(tag != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(_isValidTagLength(tag_length), error = CHIP_ERROR_INVALID_ARGUMENT);
-    if (aad_length > 0)
-    {
-        VerifyOrExit(aad != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    }
-
-    // Size of key is expressed in bits, hence the multiplication by 8.
-    result = mbedtls_ccm_setkey(&context, MBEDTLS_CIPHER_ID_AES, key.As<Symmetric128BitsKeyByteArray>(),
-                                sizeof(Symmetric128BitsKeyByteArray) * 8);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // Encrypt
-    result = mbedtls_ccm_encrypt_and_tag(&context, plaintext_length, Uint8::to_const_uchar(nonce), nonce_length,
-                                         Uint8::to_const_uchar(aad), aad_length, Uint8::to_const_uchar(plaintext),
-                                         Uint8::to_uchar(ciphertext), Uint8::to_uchar(tag), tag_length);
-    _log_mbedTLS_error(result);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    mbedtls_ccm_free(&context);
-    return error;
-}
-
-CHIP_ERROR AES_CCM_decrypt(const uint8_t * ciphertext, size_t ciphertext_len, const uint8_t * aad, size_t aad_len,
-                           const uint8_t * tag, size_t tag_length, const Aes128KeyHandle & key, const uint8_t * nonce,
-                           size_t nonce_length, uint8_t * plaintext)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 1;
-
-    mbedtls_ccm_context context;
-    mbedtls_ccm_init(&context);
-
-    VerifyOrExit(plaintext != nullptr || ciphertext_len == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(ciphertext != nullptr || ciphertext_len == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(tag != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(_isValidTagLength(tag_length), error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(nonce != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(nonce_length > 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    if (aad_len > 0)
-    {
-        VerifyOrExit(aad != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    }
-
-    // Size of key is expressed in bits, hence the multiplication by 8.
-    result = mbedtls_ccm_setkey(&context, MBEDTLS_CIPHER_ID_AES, key.As<Symmetric128BitsKeyByteArray>(),
-                                sizeof(Symmetric128BitsKeyByteArray) * 8);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // Decrypt
-    result = mbedtls_ccm_auth_decrypt(&context, ciphertext_len, Uint8::to_const_uchar(nonce), nonce_length,
-                                      Uint8::to_const_uchar(aad), aad_len, Uint8::to_const_uchar(ciphertext),
-                                      Uint8::to_uchar(plaintext), Uint8::to_const_uchar(tag), tag_length);
-    _log_mbedTLS_error(result);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    mbedtls_ccm_free(&context);
-    return error;
-}
-
-CHIP_ERROR Hash_SHA256(const uint8_t * data, const size_t data_length, uint8_t * out_buffer)
-{
-    // zero data length hash is supported.
-    VerifyOrReturnError(data != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_buffer != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-    const int result = mbedtls_sha256(Uint8::to_const_uchar(data), data_length, Uint8::to_uchar(out_buffer), 0);
-#else
-    const int result = mbedtls_sha256_ret(Uint8::to_const_uchar(data), data_length, Uint8::to_uchar(out_buffer), 0);
-#endif
-
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Hash_SHA1(const uint8_t * data, const size_t data_length, uint8_t * out_buffer)
-{
-    // zero data length hash is supported.
-    VerifyOrReturnError(out_buffer != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-    const int result = mbedtls_sha1(Uint8::to_const_uchar(data), data_length, Uint8::to_uchar(out_buffer));
-#else
-    const int result = mbedtls_sha1_ret(Uint8::to_const_uchar(data), data_length, Uint8::to_uchar(out_buffer));
-#endif
-
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-static_assert(kMAX_Hash_SHA256_Context_Size >= sizeof(mbedtls_sha256_context),
-              "kMAX_Hash_SHA256_Context_Size is too small for the size of underlying mbedtls_sha256_context");
-
-static inline mbedtls_sha256_context * to_inner_hash_sha256_context(HashSHA256OpaqueContext * context)
-{
-    return SafePointerCast<mbedtls_sha256_context *>(context);
-}
-
-Hash_SHA256_stream::Hash_SHA256_stream(void)
-{
-    mbedtls_sha256_context * context = to_inner_hash_sha256_context(&mContext);
-    mbedtls_sha256_init(context);
-}
-
-Hash_SHA256_stream::~Hash_SHA256_stream(void)
-{
-    mbedtls_sha256_context * context = to_inner_hash_sha256_context(&mContext);
-    mbedtls_sha256_free(context);
-    Clear();
-}
-
-CHIP_ERROR Hash_SHA256_stream::Begin(void)
-{
-    mbedtls_sha256_context * const context = to_inner_hash_sha256_context(&mContext);
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-    const int result = mbedtls_sha256_starts(context, 0);
-#else
-    const int result = mbedtls_sha256_starts_ret(context, 0);
-#endif
-
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Hash_SHA256_stream::AddData(const ByteSpan data)
-{
-    mbedtls_sha256_context * const context = to_inner_hash_sha256_context(&mContext);
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-    const int result = mbedtls_sha256_update(context, Uint8::to_const_uchar(data.data()), data.size());
-#else
-    const int result = mbedtls_sha256_update_ret(context, Uint8::to_const_uchar(data.data()), data.size());
-#endif
-
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Hash_SHA256_stream::GetDigest(MutableByteSpan & out_buffer)
-{
-    mbedtls_sha256_context * context = to_inner_hash_sha256_context(&mContext);
-
-    // Back-up context as we are about to finalize the hash to extract digest.
-    mbedtls_sha256_context previous_ctx;
-    mbedtls_sha256_init(&previous_ctx);
-    mbedtls_sha256_clone(&previous_ctx, context);
-
-    // Pad + compute digest, then finalize context. It is restored next line to continue.
-    CHIP_ERROR result = Finish(out_buffer);
-
-    // Restore context prior to finalization.
-    mbedtls_sha256_clone(context, &previous_ctx);
-    mbedtls_sha256_free(&previous_ctx);
-
-    return result;
-}
-
-CHIP_ERROR Hash_SHA256_stream::Finish(MutableByteSpan & out_buffer)
-{
-    VerifyOrReturnError(out_buffer.size() >= kSHA256_Hash_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
-    mbedtls_sha256_context * const context = to_inner_hash_sha256_context(&mContext);
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-    const int result = mbedtls_sha256_finish(context, Uint8::to_uchar(out_buffer.data()));
-#else
-    const int result = mbedtls_sha256_finish_ret(context, Uint8::to_uchar(out_buffer.data()));
-#endif
-
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-    out_buffer = out_buffer.SubSpan(0, kSHA256_Hash_Length);
-
-    return CHIP_NO_ERROR;
-}
-
-void Hash_SHA256_stream::Clear(void)
-{
-    mbedtls_platform_zeroize(this, sizeof(*this));
-}
-
-static EntropyContext * get_entropy_context()
-{
-    if (!gsEntropyContext.mInitialized)
-    {
-        mbedtls_entropy_init(&gsEntropyContext.mEntropy);
-        mbedtls_ctr_drbg_init(&gsEntropyContext.mDRBGCtxt);
-
-        gsEntropyContext.mInitialized = true;
-    }
-
-    return &gsEntropyContext;
-}
-
-CHIP_ERROR add_entropy_source(entropy_source fn_source, void * p_source, size_t threshold)
-{
-    VerifyOrReturnError(fn_source != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    EntropyContext * const entropy_ctxt = get_entropy_context();
-    VerifyOrReturnError(entropy_ctxt != nullptr, CHIP_ERROR_INTERNAL);
-
-    const int result =
-        mbedtls_entropy_add_source(&entropy_ctxt->mEntropy, fn_source, p_source, threshold, MBEDTLS_ENTROPY_SOURCE_STRONG);
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-    return CHIP_NO_ERROR;
-}
-
-static int CryptoRNG(void * ctxt, uint8_t * out_buffer, size_t out_length)
-{
-    return (chip::Crypto::DRBG_get_bytes(out_buffer, out_length) == CHIP_NO_ERROR) ? 0 : 1;
-}
-
-mbedtls_ecp_group_id MapECPGroupId(SupportedECPKeyTypes keyType)
-{
-    switch (keyType)
-    {
-    case SupportedECPKeyTypes::ECP256R1:
-        return MBEDTLS_ECP_DP_SECP256R1;
-    default:
-        return MBEDTLS_ECP_DP_NONE;
-    }
-}
-
-static inline mbedtls_ecp_keypair * to_keypair(P256KeypairContext * context)
-{
-    return SafePointerCast<mbedtls_ecp_keypair *>(context);
-}
-
-static inline const mbedtls_ecp_keypair * to_const_keypair(const P256KeypairContext * context)
-{
-    return SafePointerCast<const mbedtls_ecp_keypair *>(context);
-}
-
-// THE BELOW IS FROM `third_party/openthread/repo/third_party/mbedtls/repo/library/constant_time.c` since
-// mbedtls_ct_memcmp is not available on Linux somehow :(
-int mbedtls_ct_memcmp_copy(const void * a, const void * b, size_t n)
-{
-    size_t i;
-    volatile const unsigned char * A = (volatile const unsigned char *) a;
-    volatile const unsigned char * B = (volatile const unsigned char *) b;
-    volatile unsigned char diff      = 0;
-
-    for (i = 0; i < n; i++)
-    {
-        /* Read volatile data in order before computing diff.
-         * This avoids IAR compiler warning:
-         * 'the order of volatile accesses is undefined ..' */
-        unsigned char x = A[i], y = B[i];
-        diff |= x ^ y;
-    }
-
-    return ((int) diff);
-}
-
-bool IsBufferContentEqualConstantTime(const void * a, const void * b, size_t n)
-{
-    return mbedtls_ct_memcmp_copy(a, b, n) == 0;
-}
-
-void P256Keypair::Clear()
-{
-    if (mInitialized)
-    {
-        mbedtls_ecp_keypair * keypair = to_keypair(&mKeypair);
-        mbedtls_ecp_keypair_free(keypair);
-        mInitialized = false;
-    }
-}
-
-CHIP_ERROR VerifyCertificateSigningRequest(const uint8_t * csr_buf, size_t csr_length, P256PublicKey & pubkey)
-{
-#if defined(MBEDTLS_X509_CSR_PARSE_C)
-    ReturnErrorOnFailure(VerifyCertificateSigningRequestFormat(csr_buf, csr_length));
-
-    // TODO: For some embedded targets, mbedTLS library doesn't have mbedtls_x509_csr_parse_der, and mbedtls_x509_csr_parse_free.
-    //       Taking a step back, embedded targets likely will not process CSR requests. Adding this action item to reevaluate
-    //       this if there's a need for this processing for embedded targets.
-    CHIP_ERROR error   = CHIP_NO_ERROR;
-    size_t pubkey_size = 0;
-
-    mbedtls_ecp_keypair * keypair = nullptr;
-
-    P256ECDSASignature signature;
-    MutableByteSpan out_raw_sig_span(signature.Bytes(), signature.Capacity());
-
-    mbedtls_x509_csr csr;
-    mbedtls_x509_csr_init(&csr);
-
-    int result = mbedtls_x509_csr_parse_der(&csr, csr_buf, csr_length);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // Verify the signature algorithm and public key type
-    VerifyOrExit(csr.CHIP_CRYPTO_PAL_PRIVATE(sig_md) == MBEDTLS_MD_SHA256, error = CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
-    VerifyOrExit(csr.CHIP_CRYPTO_PAL_PRIVATE(sig_pk) == MBEDTLS_PK_ECDSA, error = CHIP_ERROR_WRONG_KEY_TYPE);
-
-    keypair = mbedtls_pk_ec(csr.CHIP_CRYPTO_PAL_PRIVATE_X509(pk));
-
-    // Copy the public key from the CSR
-    result = mbedtls_ecp_point_write_binary(&keypair->CHIP_CRYPTO_PAL_PRIVATE(grp), &keypair->CHIP_CRYPTO_PAL_PRIVATE(Q),
-                                            MBEDTLS_ECP_PF_UNCOMPRESSED, &pubkey_size, Uint8::to_uchar(pubkey), pubkey.Length());
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-    VerifyOrExit(pubkey_size == pubkey.Length(), error = CHIP_ERROR_INTERNAL);
-
-    // Convert DER signature to raw signature
-    error = EcdsaAsn1SignatureToRaw(kP256_FE_Length,
-                                    ByteSpan{ csr.CHIP_CRYPTO_PAL_PRIVATE(sig).CHIP_CRYPTO_PAL_PRIVATE_X509(p),
-                                              csr.CHIP_CRYPTO_PAL_PRIVATE(sig).CHIP_CRYPTO_PAL_PRIVATE_X509(len) },
-                                    out_raw_sig_span);
-
-    VerifyOrExit(error == CHIP_NO_ERROR, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(out_raw_sig_span.size() == (kP256_FE_Length * 2), error = CHIP_ERROR_INTERNAL);
-    TEMPORARY_RETURN_IGNORED signature.SetLength(out_raw_sig_span.size());
-
-    // Verify the signature using the public key
-    error = pubkey.ECDSA_validate_msg_signature(csr.CHIP_CRYPTO_PAL_PRIVATE_X509(cri).CHIP_CRYPTO_PAL_PRIVATE_X509(p),
-                                                csr.CHIP_CRYPTO_PAL_PRIVATE_X509(cri).CHIP_CRYPTO_PAL_PRIVATE_X509(len), signature);
-
-    SuccessOrExit(error);
-
-exit:
-    mbedtls_x509_csr_free(&csr);
-    _log_mbedTLS_error(result);
-    return error;
-#else
-    ChipLogError(Crypto, "MBEDTLS_X509_CSR_PARSE_C is not enabled. CSR cannot be parsed");
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-#endif
-}
-
-typedef struct Spake2p_Context
-{
-    mbedtls_ecp_group curve;
-    mbedtls_ecp_point M;
-    mbedtls_ecp_point N;
-    mbedtls_ecp_point X;
-    mbedtls_ecp_point Y;
-    mbedtls_ecp_point L;
-    mbedtls_ecp_point Z;
-    mbedtls_ecp_point V;
-
-    mbedtls_mpi w0;
-    mbedtls_mpi w1;
-    mbedtls_mpi xy;
-    mbedtls_mpi tempbn;
-} Spake2p_Context;
-
-static inline Spake2p_Context * to_inner_spake2p_context(Spake2pOpaqueContext * context)
-{
-    return SafePointerCast<Spake2p_Context *>(context);
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    memset(context, 0, sizeof(Spake2p_Context));
-
-    mbedtls_ecp_group_init(&context->curve);
-    result = mbedtls_ecp_group_load(&context->curve, MBEDTLS_ECP_DP_SECP256R1);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    VerifyOrExit(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256) != nullptr, error = CHIP_ERROR_INTERNAL);
-
-    mbedtls_ecp_point_init(&context->M);
-    mbedtls_ecp_point_init(&context->N);
-    mbedtls_ecp_point_init(&context->X);
-    mbedtls_ecp_point_init(&context->Y);
-    mbedtls_ecp_point_init(&context->L);
-    mbedtls_ecp_point_init(&context->V);
-    mbedtls_ecp_point_init(&context->Z);
-    M = &context->M;
-    N = &context->N;
-    X = &context->X;
-    Y = &context->Y;
-    L = &context->L;
-    V = &context->V;
-    Z = &context->Z;
-
-    mbedtls_mpi_init(&context->w0);
-    mbedtls_mpi_init(&context->w1);
-    mbedtls_mpi_init(&context->xy);
-    mbedtls_mpi_init(&context->tempbn);
-    w0     = &context->w0;
-    w1     = &context->w1;
-    xy     = &context->xy;
-    tempbn = &context->tempbn;
-
-    G     = &context->curve.G;
-    order = &context->curve.N;
-
-    return error;
-
-exit:
-    _log_mbedTLS_error(result);
-    Clear();
-    return error;
-}
-
-void Spake2p_P256_SHA256_HKDF_HMAC::Clear()
-{
-    VerifyOrReturn(state != CHIP_SPAKE2P_STATE::PREINIT);
-
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-    mbedtls_ecp_point_free(&context->M);
-    mbedtls_ecp_point_free(&context->N);
-    mbedtls_ecp_point_free(&context->X);
-    mbedtls_ecp_point_free(&context->Y);
-    mbedtls_ecp_point_free(&context->L);
-    mbedtls_ecp_point_free(&context->Z);
-    mbedtls_ecp_point_free(&context->V);
-
-    mbedtls_mpi_free(&context->w0);
-    mbedtls_mpi_free(&context->w1);
-    mbedtls_mpi_free(&context->xy);
-    mbedtls_mpi_free(&context->tempbn);
-
-    mbedtls_ecp_group_free(&context->curve);
-    state = CHIP_SPAKE2P_STATE::PREINIT;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::Mac(const uint8_t * key, size_t key_len, const uint8_t * in, size_t in_len,
-                                              MutableByteSpan & out_span)
-{
-    HMAC_sha hmac;
-    VerifyOrReturnError(out_span.size() >= kSHA256_Hash_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorOnFailure(hmac.HMAC_SHA256(key, key_len, in, in_len, out_span.data(), kSHA256_Hash_Length));
-    out_span = out_span.SubSpan(0, kSHA256_Hash_Length);
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::MacVerify(const uint8_t * key, size_t key_len, const uint8_t * mac, size_t mac_len,
-                                                    const uint8_t * in, size_t in_len)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    uint8_t computed_mac[kSHA256_Hash_Length];
-    MutableByteSpan computed_mac_span{ computed_mac };
-    VerifyOrExit(mac_len == kSHA256_Hash_Length, error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    SuccessOrExit(error = Mac(key, key_len, in, in_len, computed_mac_span));
-    VerifyOrExit(computed_mac_span.size() == mac_len, error = CHIP_ERROR_INTERNAL);
-
-    VerifyOrExit(IsBufferContentEqualConstantTime(mac, computed_mac, kSHA256_Hash_Length), error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    return error;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FELoad(const uint8_t * in, size_t in_len, void * fe)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    result = mbedtls_mpi_read_binary((mbedtls_mpi *) fe, Uint8::to_const_uchar(in), in_len);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_mpi_mod_mpi((mbedtls_mpi *) fe, (mbedtls_mpi *) fe, (const mbedtls_mpi *) order);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    return error;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEWrite(const void * fe, uint8_t * out, size_t out_len)
-{
-    if (mbedtls_mpi_write_binary((const mbedtls_mpi *) fe, Uint8::to_uchar(out), out_len) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEGenerate(void * fe)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    result = mbedtls_ecp_gen_privkey(&context->curve, (mbedtls_mpi *) fe, CryptoRNG, nullptr);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    return error;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEMul(void * fer, const void * fe1, const void * fe2)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    result = mbedtls_mpi_mul_mpi((mbedtls_mpi *) fer, (const mbedtls_mpi *) fe1, (const mbedtls_mpi *) fe2);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_mpi_mod_mpi((mbedtls_mpi *) fer, (mbedtls_mpi *) fer, (const mbedtls_mpi *) order);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    return error;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointLoad(const uint8_t * in, size_t in_len, void * R)
-{
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_ecp_point_read_binary(&context->curve, (mbedtls_ecp_point *) R, Uint8::to_const_uchar(in), in_len) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointWrite(const void * R, uint8_t * out, size_t out_len)
-{
-    memset(out, 0, out_len);
-
-    size_t mbedtls_out_len = out_len;
-
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_ecp_point_write_binary(&context->curve, (const mbedtls_ecp_point *) R, MBEDTLS_ECP_PF_UNCOMPRESSED,
-                                       &mbedtls_out_len, Uint8::to_uchar(out), out_len) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointMul(void * R, const void * P1, const void * fe1)
-{
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_ecp_mul(&context->curve, (mbedtls_ecp_point *) R, (const mbedtls_mpi *) fe1, (const mbedtls_ecp_point *) P1,
-                        CryptoRNG, nullptr) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointAddMul(void * R, const void * P1, const void * fe1, const void * P2,
-                                                      const void * fe2)
-{
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_ecp_muladd(&context->curve, (mbedtls_ecp_point *) R, (const mbedtls_mpi *) fe1, (const mbedtls_ecp_point *) P1,
-                           (const mbedtls_mpi *) fe2, (const mbedtls_ecp_point *) P2) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointInvert(void * R)
-{
-    mbedtls_ecp_point * Rp    = (mbedtls_ecp_point *) R;
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_mpi_sub_mpi(&Rp->CHIP_CRYPTO_PAL_PRIVATE(Y), &context->curve.P, &Rp->CHIP_CRYPTO_PAL_PRIVATE(Y)) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointCofactorMul(void * R)
-{
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::ComputeL(uint8_t * Lout, size_t * L_len, const uint8_t * w1sin, size_t w1sin_len)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-
-    mbedtls_ecp_group curve;
-    mbedtls_mpi w1_bn;
-    mbedtls_ecp_point Ltemp;
-
-    mbedtls_ecp_group_init(&curve);
-    mbedtls_mpi_init(&w1_bn);
-    mbedtls_ecp_point_init(&Ltemp);
-
-    result = mbedtls_ecp_group_load(&curve, MBEDTLS_ECP_DP_SECP256R1);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_mpi_read_binary(&w1_bn, Uint8::to_const_uchar(w1sin), w1sin_len);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_mpi_mod_mpi(&w1_bn, &w1_bn, &curve.N);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_ecp_mul(&curve, &Ltemp, &w1_bn, &curve.G, CryptoRNG, nullptr);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    memset(Lout, 0, *L_len);
-
-    result = mbedtls_ecp_point_write_binary(&curve, &Ltemp, MBEDTLS_ECP_PF_UNCOMPRESSED, L_len, Uint8::to_uchar(Lout), *L_len);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_ecp_point_free(&Ltemp);
-    mbedtls_mpi_free(&w1_bn);
-    mbedtls_ecp_group_free(&curve);
-
-    return error;
-}
-
-CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
-{
-    Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
-    if (mbedtls_ecp_check_pubkey(&context->curve, (mbedtls_ecp_point *) R) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-namespace {
-
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-bool IsTimeGreaterThanEqual(const mbedtls_x509_time * const timeA, const mbedtls_x509_time * const timeB)
-{
-
-    // checks if two values are different and if yes, then returns first > second.
-#define RETURN_STRICTLY_GREATER_IF_DIFFERENT(component)                                                                            \
-    {                                                                                                                              \
-        auto valueA = timeA->CHIP_CRYPTO_PAL_PRIVATE_X509(component);                                                              \
-        auto valueB = timeB->CHIP_CRYPTO_PAL_PRIVATE_X509(component);                                                              \
-                                                                                                                                   \
-        if (valueA != valueB)                                                                                                      \
-        {                                                                                                                          \
-            return valueA > valueB;                                                                                                \
-        }                                                                                                                          \
-    }
-
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(year);
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(mon);
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(day);
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(hour);
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(min);
-    RETURN_STRICTLY_GREATER_IF_DIFFERENT(sec);
-
-    // all above are equal
-    return true;
-}
-
-CHIP_ERROR IsCertificateValidAtIssuance(const mbedtls_x509_crt * candidateCertificate, const mbedtls_x509_crt * issuerCertificate)
-{
-    mbedtls_x509_time candidateNotBeforeTime = candidateCertificate->CHIP_CRYPTO_PAL_PRIVATE_X509(valid_from);
-    mbedtls_x509_time issuerNotBeforeTime    = issuerCertificate->CHIP_CRYPTO_PAL_PRIVATE_X509(valid_from);
-    mbedtls_x509_time issuerNotAfterTime     = issuerCertificate->CHIP_CRYPTO_PAL_PRIVATE_X509(valid_to);
-
-    // check if candidateCertificate is issued at or after issuerCertificate's notBefore timestamp
-    VerifyOrReturnError(IsTimeGreaterThanEqual(&candidateNotBeforeTime, &issuerNotBeforeTime), CHIP_ERROR_CERT_EXPIRED);
-
-    // check if candidateCertificate is issued at or before issuerCertificate's notAfter timestamp
-    VerifyOrReturnError(IsTimeGreaterThanEqual(&issuerNotAfterTime, &candidateNotBeforeTime), CHIP_ERROR_CERT_EXPIRED);
-
-    return CHIP_NO_ERROR;
-}
-
-int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, int depth, uint32_t * flags)
-{
-    mbedtls_x509_crt * leafCert   = reinterpret_cast<mbedtls_x509_crt *>(data);
-    mbedtls_x509_crt * issuerCert = crt;
-
-    // Ignore any time validy error performed by the standard mbedTLS code.
-    *flags &= ~(static_cast<uint32_t>(MBEDTLS_X509_BADCERT_EXPIRED | MBEDTLS_X509_BADCERT_FUTURE));
-
-    // Verify that the leaf certificate has a notBefore time valid within the validity period of the issuerCertificate.
-    // Note that this callback is invoked for each certificate in the chain.
-    if (IsCertificateValidAtIssuance(leafCert, issuerCert) != CHIP_NO_ERROR)
-    {
-        return MBEDTLS_ERR_X509_INVALID_DATE;
-    }
-
-    return 0;
-}
-
-constexpr uint8_t sOID_AttributeType_CommonName[]         = { 0x55, 0x04, 0x03 };
-constexpr uint8_t sOID_AttributeType_MatterVendorId[]     = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
-constexpr uint8_t sOID_AttributeType_MatterProductId[]    = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
-constexpr uint8_t sOID_SigAlgo_ECDSAWithSHA256[]          = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
-constexpr uint8_t sOID_Extension_BasicConstraints[]       = { 0x55, 0x1D, 0x13 };
-constexpr uint8_t sOID_Extension_KeyUsage[]               = { 0x55, 0x1D, 0x0F };
-constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
-constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
-
-/**
- * Compares an mbedtls_asn1_buf structure (oidBuf) to a reference OID represented as uint8_t array (oid).
- */
-#define OID_CMP(oid, oidBuf)                                                                                                       \
-    ((MBEDTLS_ASN1_OID == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(tag)) &&                                                           \
-     (sizeof(oid) == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) &&                                                                \
-     (memcmp((oid), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(p), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) == 0))
-
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-} // anonymous namespace
-
-CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-    mbedtls_x509_crt mbed_cert;
-    unsigned char * p         = nullptr;
-    const unsigned char * end = nullptr;
-    size_t len                = 0;
-    bool extBasicPresent      = false;
-    bool extKeyUsagePresent   = false;
-
-    VerifyOrReturnError(!cert.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-
-    mbedtls_x509_crt_init(&mbed_cert);
-
-    result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(cert.data()), cert.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // "version" value is 1 higher than the actual encoded value.
-    VerifyOrExit(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(version) - 1 == 2, error = CHIP_ERROR_INTERNAL);
-
-    // Verify signature algorithms is ECDSA with SHA256.
-    VerifyOrExit(OID_CMP(sOID_SigAlgo_ECDSAWithSHA256, mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(sig_oid)),
-                 error = CHIP_ERROR_INTERNAL);
-
-    // Verify public key presence and format.
-    {
-        Crypto::P256PublicKey pubkey;
-        SuccessOrExit(error = ExtractPubkeyFromX509Cert(cert, pubkey));
-    }
-
-    p      = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-    end    = p + mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-    result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    while (p < end)
-    {
-        mbedtls_x509_buf extOID = { 0, 0, nullptr };
-        int extCritical         = 0;
-
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-        /* Get extension ID */
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(tag) = MBEDTLS_ASN1_OID;
-        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(len) = len;
-        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(p)   = p;
-        p += len;
-
-        /* Get optional critical */
-        result = mbedtls_asn1_get_bool(&p, end, &extCritical);
-        VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
-
-        /* Data should be octet string type */
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-        if (OID_CMP(sOID_Extension_BasicConstraints, extOID))
-        {
-            int isCA    = 0;
-            int pathLen = -1;
-            unsigned char * seqStart;
-
-            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
-            extBasicPresent = true;
-
-            result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-            if (len > 0)
-            {
-                seqStart = p;
-                result   = mbedtls_asn1_get_bool(&p, end, &isCA);
-                VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
-
-                if (p != seqStart + len)
-                {
-                    result = mbedtls_asn1_get_int(&p, end, &pathLen);
-                    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-                }
-            }
-
-            if (certType == AttestationCertType::kDAC)
-            {
-                VerifyOrExit(!isCA && pathLen == -1, error = CHIP_ERROR_INTERNAL);
-            }
-            else if (certType == AttestationCertType::kPAI)
-            {
-                VerifyOrExit(isCA && pathLen == 0, error = CHIP_ERROR_INTERNAL);
-            }
-            else
-            {
-                VerifyOrExit(isCA && (pathLen == -1 || pathLen == 0 || pathLen == 1), error = CHIP_ERROR_INTERNAL);
-            }
-        }
-        else if (OID_CMP(sOID_Extension_KeyUsage, extOID))
-        {
-            mbedtls_x509_bitstring bs = { 0, 0, nullptr };
-            unsigned int keyUsage     = 0;
-
-            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
-            extKeyUsagePresent = true;
-
-            result = mbedtls_asn1_get_bitstring(&p, p + len, &bs);
-            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-            for (size_t i = 0; i < bs.CHIP_CRYPTO_PAL_PRIVATE_X509(len) && i < sizeof(unsigned int); i++)
-            {
-                keyUsage |= static_cast<unsigned int>(bs.CHIP_CRYPTO_PAL_PRIVATE_X509(p)[i]) << (8 * i);
-            }
-
-            if (certType == AttestationCertType::kDAC)
-            {
-                // SHALL only have the digitalSignature bit set.
-                VerifyOrExit(keyUsage == MBEDTLS_X509_KU_DIGITAL_SIGNATURE, error = CHIP_ERROR_INTERNAL);
-            }
-            else
-            {
-                bool keyCertSignFlag = keyUsage & MBEDTLS_X509_KU_KEY_CERT_SIGN;
-                bool crlSignFlag     = keyUsage & MBEDTLS_X509_KU_CRL_SIGN;
-                bool otherFlags =
-                    keyUsage & ~(MBEDTLS_X509_KU_CRL_SIGN | MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_DIGITAL_SIGNATURE);
-                VerifyOrExit(keyCertSignFlag && crlSignFlag && !otherFlags, error = CHIP_ERROR_INTERNAL);
-            }
-        }
-        else
-        {
-            p += len;
-        }
-    }
-
-    // Verify basic and key usage extensions are present.
-    VerifyOrExit(extBasicPresent && extKeyUsagePresent, error = CHIP_ERROR_INTERNAL);
-
-    // Verify that SKID and AKID extensions are present.
-    {
-        uint8_t kidBuf[kSubjectKeyIdentifierLength];
-        MutableByteSpan kid(kidBuf);
-        SuccessOrExit(error = ExtractSKIDFromX509Cert(cert, kid));
-        if (certType == AttestationCertType::kDAC || certType == AttestationCertType::kPAI)
-        {
-            // Mandatory extension for DAC and PAI certs.
-            SuccessOrExit(error = ExtractAKIDFromX509Cert(cert, kid));
-        }
-    }
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbed_cert);
-
-#else
-    (void) cert;
-    (void) certType;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t rootCertificateLen, const uint8_t * caCertificate,
-                                    size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
-                                    CertificateChainValidationResult & result)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    mbedtls_x509_crt certChain;
-    mbedtls_x509_crt rootCert;
-    int mbedResult;
-    uint32_t flags = 0;
-
-    result = CertificateChainValidationResult::kInternalFrameworkError;
-
-    VerifyOrReturnError(rootCertificate != nullptr && rootCertificateLen != 0,
-                        (result = CertificateChainValidationResult::kRootArgumentInvalid, CHIP_ERROR_INVALID_ARGUMENT));
-    VerifyOrReturnError(leafCertificate != nullptr && leafCertificateLen != 0,
-                        (result = CertificateChainValidationResult::kLeafArgumentInvalid, CHIP_ERROR_INVALID_ARGUMENT));
-
-    mbedtls_x509_crt_init(&certChain);
-    mbedtls_x509_crt_init(&rootCert);
-
-    /* Start of chain  */
-    mbedResult = mbedtls_x509_crt_parse(&certChain, Uint8::to_const_uchar(leafCertificate), leafCertificateLen);
-    VerifyOrExit(mbedResult == 0, (result = CertificateChainValidationResult::kLeafFormatInvalid, error = CHIP_ERROR_INTERNAL));
-
-    /* Add the intermediate to the chain, if present */
-    if (caCertificate != nullptr && caCertificateLen > 0)
-    {
-        mbedResult = mbedtls_x509_crt_parse(&certChain, Uint8::to_const_uchar(caCertificate), caCertificateLen);
-        VerifyOrExit(mbedResult == 0, (result = CertificateChainValidationResult::kICAFormatInvalid, error = CHIP_ERROR_INTERNAL));
-    }
-
-    /* Parse the root cert */
-    mbedResult = mbedtls_x509_crt_parse(&rootCert, Uint8::to_const_uchar(rootCertificate), rootCertificateLen);
-    VerifyOrExit(mbedResult == 0, (result = CertificateChainValidationResult::kRootFormatInvalid, error = CHIP_ERROR_INTERNAL));
-
-    /* Verify the chain against the root */
-    mbedResult =
-        mbedtls_x509_crt_verify(&certChain, &rootCert, nullptr, nullptr, &flags, CallbackForCustomValidityCheck, &certChain);
-
-    switch (mbedResult)
-    {
-    case 0:
-        VerifyOrExit(flags == 0, (result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
-        result = CertificateChainValidationResult::kSuccess;
-        break;
-    case MBEDTLS_ERR_X509_INVALID_DATE:
-    case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:
-        result = CertificateChainValidationResult::kChainInvalid;
-        error  = CHIP_ERROR_CERT_NOT_TRUSTED;
-        break;
-    default:
-        result = CertificateChainValidationResult::kInternalFrameworkError;
-        error  = CHIP_ERROR_INTERNAL;
-        break;
-    }
-
-exit:
-    _log_mbedTLS_error(mbedResult);
-    mbedtls_x509_crt_free(&certChain);
-    mbedtls_x509_crt_free(&rootCert);
-
-#else
-    (void) rootCertificate;
-    (void) rootCertificateLen;
-    (void) caCertificate;
-    (void) caCertificateLen;
-    (void) leafCertificate;
-    (void) leafCertificateLen;
-    (void) result;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-CHIP_ERROR IsCertificateValidAtIssuance(const ByteSpan & candidateCertificate, const ByteSpan & issuerCertificate)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    mbedtls_x509_crt mbedCandidateCertificate;
-    mbedtls_x509_crt mbedIssuerCertificate;
-    int result;
-
-    VerifyOrReturnError(!candidateCertificate.empty() && !issuerCertificate.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-
-    mbedtls_x509_crt_init(&mbedCandidateCertificate);
-    mbedtls_x509_crt_init(&mbedIssuerCertificate);
-
-    result = mbedtls_x509_crt_parse(&mbedCandidateCertificate, Uint8::to_const_uchar(candidateCertificate.data()),
-                                    candidateCertificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result =
-        mbedtls_x509_crt_parse(&mbedIssuerCertificate, Uint8::to_const_uchar(issuerCertificate.data()), issuerCertificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // Verify that the candidateCertificate has a notBefore time valid within the validity period of the issuerCertificate.
-    SuccessOrExit(error = IsCertificateValidAtIssuance(&mbedCandidateCertificate, &mbedIssuerCertificate));
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbedCandidateCertificate);
-    mbedtls_x509_crt_free(&mbedIssuerCertificate);
-
-#else
-    (void) candidateCertificate;
-    (void) issuerCertificate;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-CHIP_ERROR IsCertificateValidAtCurrentTime(const ByteSpan & certificate)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    mbedtls_x509_crt mbedCertificate;
-    int result;
-
-    VerifyOrReturnError(!certificate.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-
-    mbedtls_x509_crt_init(&mbedCertificate);
-
-    result = mbedtls_x509_crt_parse(&mbedCertificate, Uint8::to_const_uchar(certificate.data()), certificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // check if certificate's notBefore timestamp is earlier than or equal to current time.
-    result = mbedtls_x509_time_is_past(&mbedCertificate.CHIP_CRYPTO_PAL_PRIVATE_X509(valid_from));
-    VerifyOrExit(result == 1, error = CHIP_ERROR_CERT_EXPIRED);
-
-    // check if certificate's notAfter timestamp is later than current time.
-    result = mbedtls_x509_time_is_future(&mbedCertificate.CHIP_CRYPTO_PAL_PRIVATE_X509(valid_to));
-    VerifyOrExit(result == 1, error = CHIP_ERROR_CERT_EXPIRED);
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbedCertificate);
-
-#else
-    (void) certificate;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-CHIP_ERROR ExtractPubkeyFromX509Cert(const ByteSpan & certificate, Crypto::P256PublicKey & pubkey)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    mbedtls_x509_crt mbed_cert;
-    mbedtls_ecp_keypair * keypair = nullptr;
-    size_t pubkey_size            = 0;
-
-    mbedtls_x509_crt_init(&mbed_cert);
-
-    int result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(certificate.data()), certificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    VerifyOrExit(mbedtls_pk_get_type(&(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(pk))) == MBEDTLS_PK_ECKEY,
-                 error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    keypair = mbedtls_pk_ec(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(pk));
-    VerifyOrExit(keypair != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(keypair->CHIP_CRYPTO_PAL_PRIVATE(grp).id == MapECPGroupId(pubkey.Type()), error = CHIP_ERROR_INVALID_ARGUMENT);
-    // Copy the public key from the cert in raw point format
-    result =
-        mbedtls_ecp_point_write_binary(&keypair->CHIP_CRYPTO_PAL_PRIVATE(grp), &keypair->CHIP_CRYPTO_PAL_PRIVATE(Q),
-                                       MBEDTLS_ECP_PF_UNCOMPRESSED, &pubkey_size, Uint8::to_uchar(pubkey.Bytes()), pubkey.Length());
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-    VerifyOrExit(pubkey_size == pubkey.Length(), error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbed_cert);
-
-#else
-    (void) certificate;
-    (void) pubkey;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-namespace {
-
-CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate, MutableByteSpan & kid)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_ERROR_NOT_FOUND;
-    mbedtls_x509_crt mbed_cert;
-    unsigned char * p         = nullptr;
-    const unsigned char * end = nullptr;
-    size_t len                = 0;
-
-    mbedtls_x509_crt_init(&mbed_cert);
-
-    int result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(certificate.data()), certificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // TODO: The mbedTLS team is working on supporting SKID and AKID extensions processing.
-    // Once it is supported, this code should be updated.
-
-    p   = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-    end = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p) +
-        mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-    result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-
-    while (p < end)
-    {
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-
-        mbedtls_x509_buf extOID    = { MBEDTLS_ASN1_OID, len, p };
-        bool extractCurrentExtSKID = extractSKID && OID_CMP(sOID_Extension_SubjectKeyIdentifier, extOID);
-        bool extractCurrentExtAKID = !extractSKID && OID_CMP(sOID_Extension_AuthorityKeyIdentifier, extOID);
-        p += len;
-
-        int is_critical = 0;
-        result          = mbedtls_asn1_get_bool(&p, end, &is_critical);
-        VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_WRONG_CERT_TYPE);
-
-        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
-        VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-
-        if (extractCurrentExtSKID || extractCurrentExtAKID)
-        {
-            if (extractCurrentExtSKID)
-            {
-                result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
-                VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-            }
-            else
-            {
-                result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
-                VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-                result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONTEXT_SPECIFIC);
-                VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
-                // Other optional fields, authorityCertIssuer and authorityCertSerialNumber,
-                // will be skipped if present.
-            }
-            VerifyOrExit(len == kSubjectKeyIdentifierLength, error = CHIP_ERROR_WRONG_CERT_TYPE);
-            VerifyOrExit(len <= kid.size(), error = CHIP_ERROR_BUFFER_TOO_SMALL);
-            memcpy(kid.data(), p, len);
-            if (kid.size() > len)
-            {
-                kid.reduce_size(len);
-            }
-            ExitNow(error = CHIP_NO_ERROR);
-            break;
-        }
-        p += len;
-    }
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbed_cert);
-
-#else
-    (void) certificate;
-    (void) kid;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-} // namespace
-
-CHIP_ERROR ExtractSKIDFromX509Cert(const ByteSpan & certificate, MutableByteSpan & skid)
-{
-    return ExtractKIDFromX509Cert(true, certificate, skid);
-}
-
-CHIP_ERROR ExtractAKIDFromX509Cert(const ByteSpan & certificate, MutableByteSpan & akid)
-{
-    return ExtractKIDFromX509Cert(false, certificate, akid);
-}
-
-CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCertVidPid & vidpid)
-{
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    mbedtls_x509_crt mbed_cert;
-    mbedtls_asn1_named_data * dnIterator = nullptr;
-    AttestationCertVidPid vidpidFromCN;
-
-    mbedtls_x509_crt_init(&mbed_cert);
-
-    int result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(certificate.data()), certificate.size());
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    for (dnIterator = &mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(subject); dnIterator != nullptr;
-         dnIterator = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(next))
-    {
-        DNAttrType attrType = DNAttrType::kUnspecified;
-        if (OID_CMP(sOID_AttributeType_CommonName, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
-        {
-            attrType = DNAttrType::kCommonName;
-        }
-        else if (OID_CMP(sOID_AttributeType_MatterVendorId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
-        {
-            attrType = DNAttrType::kMatterVID;
-        }
-        else if (OID_CMP(sOID_AttributeType_MatterProductId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
-        {
-            attrType = DNAttrType::kMatterPID;
-        }
-
-        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-        error           = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
-        SuccessOrExit(error);
-    }
-
-    // If Matter Attributes were not found use values extracted from the CN Attribute,
-    // which might be uninitialized as well.
-    if (!vidpid.Initialized())
-    {
-        vidpid = vidpidFromCN;
-    }
-
-exit:
-    _log_mbedTLS_error(result);
-    mbedtls_x509_crt_free(&mbed_cert);
-
-#else
-    (void) certificate;
-    (void) vidpid;
-    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
-
-    return error;
-}
-
-} // namespace Crypto
-} // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h
index daca83631c8..ac8c4be42fc 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h
@@ -31,10 +31,10 @@
  *  3. Enable spake HSM class in src\protocols\secure_channel\PASESession.h (change Crypto::Spake2p_P256_SHA256_HKDF_HMAC
  * mSpake2p; to Crypto::Spake2pHSM_P256_SHA256_HKDF_HMAC mSpake2p;). Also include the header
  * <platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h> in PASESession.h.
- *  4. Define ENABLE_SE05X_SPAKE_VERIFIER in  src/app/server/BUILD.gn, src/controller/BUILD.gn,
- * src/protocols/secure_channel/BUILD.gn . add the following lines in BUILD.gn file -
- * import("${chip_root}/src/platform/nxp/crypto/se05x/args.gni") and if (chip_se05x_spake_verifier) { defines += [
- * "ENABLE_SE05X_SPAKE_VERIFIER=1" ]}
+ *  4. Modify build files -
+ *    4a - Define ENABLE_SE05X_SPAKE_VERIFIER in  src/app/server/BUILD.gn,
+ *    4b - Define ENABLE_SE05X_SPAKE_VERIFIER in  src/controller/BUILD.gn,
+ *    4c - Define ENABLE_SE05X_SPAKE_VERIFIER in  src/protocols/secure_channel/BUILD.gn.
  */
 
 #ifndef ENABLE_SE05X_SPAKE_VERIFIER
@@ -68,72 +68,48 @@
 #endif // ENABLE_SE05X_RND_GEN
 
 /*
- * Enable se05x for Generate EC Key
- */
-#ifndef ENABLE_SE05X_GENERATE_EC_KEY
-#ifdef CONFIG_CHIP_SE05X_GENERATE_EC_KEY
-#define ENABLE_SE05X_GENERATE_EC_KEY CONFIG_CHIP_SE05X_GENERATE_EC_KEY
-#else
-#define ENABLE_SE05X_GENERATE_EC_KEY 0
-#endif
-#endif // ENABLE_SE05X_GENERATE_EC_KEY
-
-/*
- * Enable ECDSA Verify using se05x
- */
-#ifndef ENABLE_SE05X_ECDSA_VERIFY
-#ifdef CONFIG_CHIP_SE05X_ECDSA_VERIFY
-#define ENABLE_SE05X_ECDSA_VERIFY CONFIG_CHIP_SE05X_ECDSA_VERIFY
-#else
-#define ENABLE_SE05X_ECDSA_VERIFY 0
-#endif
-#endif // ENABLE_SE05X_ECDSA_VERIFY
-
-/*
- * Enable se05x for PBKDF SHA256
- * Note: Not supported for SE052F.
+ * Enable se05x for DA
+ * Ensure to run the provision example (one time) `third_party/simw-top-mini/repo/demos/se05x_dev_attest_key_prov/` to provision the
+   device attestation key at id - 0x7FFF3007 and
+   device attestation certificate at id - 0x7FFF3003.
  */
-#ifndef ENABLE_SE05X_PBKDF2_SHA256
-#ifdef CONFIG_CHIP_SE05X_PBKDF2_SHA256
-#define ENABLE_SE05X_PBKDF2_SHA256 CONFIG_CHIP_SE05X_PBKDF2_SHA256
+#ifndef ENABLE_SE05X_DEVICE_ATTESTATION
+#ifdef CONFIG_CHIP_SE05X_DEVICE_ATTESTATION
+#define ENABLE_SE05X_DEVICE_ATTESTATION CONFIG_CHIP_SE05X_DEVICE_ATTESTATION
 #else
-#define ENABLE_SE05X_PBKDF2_SHA256 0
+#define ENABLE_SE05X_DEVICE_ATTESTATION 0
 #endif
-#endif // ENABLE_SE05X_PBKDF2_SHA256
+#endif // ENABLE_SE05X_DEVICE_ATTESTATION
 
 /*
- * Enable se05x for HKDF SHA256
- * Note: Not supported for SE052F.
+ * Enable se05x for SPAKE VERIFIER by using Trust provisioned W0 and L values
  */
-#ifndef ENABLE_SE05X_HKDF_SHA256
-#ifdef CONFIG_CHIP_SE05X_HKDF_SHA256
-#define ENABLE_SE05X_HKDF_SHA256 CONFIG_CHIP_SE05X_HKDF_SHA256
+#ifndef ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+#ifdef CONFIG_CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+#define ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES CONFIG_CHIP_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
 #else
-#define ENABLE_SE05X_HKDF_SHA256 0
+#define ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES 0
 #endif
-#endif // ENABLE_SE05X_HKDF_SHA256
+#endif // ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
 
 /*
- * Enable se05x for HMAC SHA256
+ * SE05X TRUST PROVISIONED SPAKE VERIFIER SET NUMBER
  */
-#ifndef ENABLE_SE05X_HMAC_SHA256
-#ifdef CONFIG_CHIP_SE05X_HMAC_SHA256
-#define ENABLE_SE05X_HMAC_SHA256 CONFIG_CHIP_SE05X_HMAC_SHA256
+#ifndef SE05X_SPAKE_VERIFIER_TP_SET_NO
+#ifdef CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_SET_NO
+#define SE05X_SPAKE_VERIFIER_TP_SET_NO CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_SET_NO
 #else
-#define ENABLE_SE05X_HMAC_SHA256 0
+#define SE05X_SPAKE_VERIFIER_TP_SET_NO 1
 #endif
-#endif // ENABLE_SE05X_HMAC_SHA256
+#endif // SE05X_SPAKE_VERIFIER_TP_SET_NO
 
 /*
- * Enable se05x for DA
- * Ensure to run the provision example (one time) `third_party/simw-top-mini/repo/demos/se05x_dev_attest_key_prov/` to provision the
-   device attestation key at id - 0x7D300000 and
-   device attestation certificate at id - 0x7D300001.
+ * SE05X TRUST PROVISIONED SPAKE VERIFIER ITERATION COUNT
  */
-#ifndef ENABLE_SE05X_DEVICE_ATTESTATION
-#ifdef CONFIG_CHIP_SE05X_DEVICE_ATTESTATION
-#define ENABLE_SE05X_DEVICE_ATTESTATION CONFIG_CHIP_SE05X_DEVICE_ATTESTATION
+#ifndef SE05X_SPAKE_VERIFIER_TP_ITER_CNT
+#ifdef CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_ITER_CNT
+#define SE05X_SPAKE_VERIFIER_TP_ITER_CNT CONFIG_CHIP_SE05X_SPAKE_VERIFIER_TP_ITER_CNT
 #else
-#define ENABLE_SE05X_DEVICE_ATTESTATION 0
+#define SE05X_SPAKE_VERIFIER_TP_ITER_CNT 1000
 #endif
-#endif // ENABLE_SE05X_DEVICE_ATTESTATION
+#endif // SE05X_SPAKE_VERIFIER_TP_ITER_CNT
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hkdf.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hkdf.cpp
index 0a1d870cdca..78ea9e78e91 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hkdf.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hkdf.cpp
@@ -28,23 +28,18 @@
 namespace chip {
 namespace Crypto {
 
-extern CHIP_ERROR HKDF_SHA256_H(const uint8_t * secret, const size_t secret_length, const uint8_t * salt, const size_t salt_length,
-                                const uint8_t * info, const size_t info_length, uint8_t * out_buffer, size_t out_length);
-
-CHIP_ERROR HKDF_sha::HKDF_SHA256(const uint8_t * secret, const size_t secret_length, const uint8_t * salt, const size_t salt_length,
-                                 const uint8_t * info, const size_t info_length, uint8_t * out_buffer, size_t out_length)
+CHIP_ERROR HKDF_sha_SE05x::HKDF_SHA256(const uint8_t * secret, const size_t secret_length, const uint8_t * salt,
+                                       const size_t salt_length, const uint8_t * info, const size_t info_length,
+                                       uint8_t * out_buffer, size_t out_length)
 {
-#if !ENABLE_SE05X_HKDF_SHA256
-    return HKDF_SHA256_H(secret, secret_length, salt, salt_length, info, info_length, out_buffer, out_length);
-#else
     CHIP_ERROR error       = CHIP_ERROR_INTERNAL;
     uint32_t keyid         = kKeyId_hkdf_sha256_hmac_keyid;
     sss_object_t keyObject = { 0 };
 
     if (salt_length > 64 || info_length > 80 || secret_length > 256 || out_length > 768)
     {
-        /* Length not supported by se05x. Rollback to SW */
-        return HKDF_SHA256_H(secret, secret_length, salt, salt_length, info, info_length, out_buffer, out_length);
+        /* Length not supported by se05x. */
+        return CHIP_ERROR_INTERNAL;
     }
 
     ChipLogDetail(Crypto, "HKDF_SHA256 : Using se05x for HKDF");
@@ -61,6 +56,7 @@ CHIP_ERROR HKDF_sha::HKDF_SHA256(const uint8_t * secret, const size_t secret_len
     VerifyOrReturnError(secret != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     VerifyOrReturnError(se05x_session_open() == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
+    VerifyOrReturnError(gex_sss_chip_ctx.session.subsystem != kType_SSS_SubSystem_NONE, CHIP_ERROR_INTERNAL);
     VerifyOrReturnError(gex_sss_chip_ctx.ks.session != NULL, CHIP_ERROR_INTERNAL);
 
     sss_status_t status = sss_key_object_init(&keyObject, &gex_sss_chip_ctx.ks);
@@ -86,8 +82,6 @@ CHIP_ERROR HKDF_sha::HKDF_SHA256(const uint8_t * secret, const size_t secret_len
         sss_key_store_erase_key(&gex_sss_chip_ctx.ks, &keyObject);
     }
     return error;
-
-#endif // ENABLE_SE05X_HKDF_SHA256
 }
 
 } // namespace Crypto
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hmac.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hmac.cpp
index 21a69f93b6e..0f7e43d0e89 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hmac.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_hmac.cpp
@@ -30,16 +30,10 @@
 namespace chip {
 namespace Crypto {
 
-extern CHIP_ERROR HMAC_SHA256_h(const uint8_t * key, size_t key_length, const uint8_t * message, size_t message_length,
-                                uint8_t * out_buffer, size_t out_length);
-
-CHIP_ERROR HMAC_sha::HMAC_SHA256(const uint8_t * key, size_t key_length, const uint8_t * message, size_t message_length,
-                                 uint8_t * out_buffer, size_t out_length)
+CHIP_ERROR HMAC_sha_SE05x::HMAC_SHA256(const uint8_t * key, size_t key_length, const uint8_t * message, size_t message_length,
+                                       uint8_t * out_buffer, size_t out_length)
 
 {
-#if !ENABLE_SE05X_HMAC_SHA256
-    return HMAC_SHA256_h(key, key_length, message, message_length, out_buffer, out_length);
-#else
     CHIP_ERROR error       = CHIP_ERROR_INTERNAL;
     uint32_t keyid         = kKeyId_hmac_sha256_keyid;
     sss_mac_t ctx_mac      = { 0 };
@@ -117,11 +111,10 @@ CHIP_ERROR HMAC_sha::HMAC_SHA256(const uint8_t * key, size_t key_length, const u
     }
 
     return error;
-#endif
 }
 
-CHIP_ERROR HMAC_sha::HMAC_SHA256(const Hmac128KeyHandle & key, const uint8_t * message, size_t message_length, uint8_t * out_buffer,
-                                 size_t out_length)
+CHIP_ERROR HMAC_sha_SE05x::HMAC_SHA256(const Hmac128KeyHandle & key, const uint8_t * message, size_t message_length,
+                                       uint8_t * out_buffer, size_t out_length)
 {
     return HMAC_SHA256(key.As<Symmetric128BitsKeyByteArray>(), sizeof(Symmetric128BitsKeyByteArray), message, message_length,
                        out_buffer, out_length);
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp
index 2cc73d2c5cb..ff141622f7a 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp
@@ -70,12 +70,7 @@ extern CHIP_ERROR NewCertificateSigningRequest_H(P256KeypairContext * mKeypair,
 extern CHIP_ERROR Deserialize_H(P256Keypair * pk, P256PublicKey * mPublicKey, P256KeypairContext * mKeypair,
                                 P256SerializedKeypair & input);
 extern CHIP_ERROR Serialize_H(const P256KeypairContext mKeypair, const P256PublicKey mPublicKey, P256SerializedKeypair & output);
-extern CHIP_ERROR ECDSA_validate_msg_signature_H(const P256PublicKey * public_key, const uint8_t * msg, const size_t msg_length,
-                                                 const P256ECDSASignature & signature);
-extern CHIP_ERROR ECDSA_validate_hash_signature_H(const P256PublicKey * public_key, const uint8_t * hash, const size_t hash_length,
-                                                  const P256ECDSASignature & signature);
 
-#if (ENABLE_SE05X_GENERATE_EC_KEY || ENABLE_SE05X_ECDSA_VERIFY)
 static CHIP_ERROR parse_se05x_keyid_from_keypair(const P256KeypairContext mKeypair, uint32_t * key_id)
 {
     if (0 != memcmp(&mKeypair.mBytes[0], se05x_magic_no, sizeof(se05x_magic_no)))
@@ -90,31 +85,19 @@ static CHIP_ERROR parse_se05x_keyid_from_keypair(const P256KeypairContext mKeypa
 
     return CHIP_NO_ERROR;
 }
-#endif // #if (ENABLE_SE05X_GENERATE_EC_KEY || ENABLE_SE05X_ECDSA_VERIFY)
 
-P256Keypair::~P256Keypair()
+P256KeypairSE05x::~P256KeypairSE05x()
 {
-#if (ENABLE_SE05X_GENERATE_EC_KEY || ENABLE_SE05X_ECDSA_VERIFY)
     uint32_t keyid = 0;
     if (CHIP_NO_ERROR != parse_se05x_keyid_from_keypair(mKeypair, &keyid))
     {
         Clear();
     }
-#else
-    Clear();
-#endif
+    mInitialized = false;
 }
 
-CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
+CHIP_ERROR P256KeypairSE05x::Initialize(ECPKeyTarget key_target)
 {
-#if !ENABLE_SE05X_GENERATE_EC_KEY
-    CHIP_ERROR error = Initialize_H(this, &mPublicKey, &mKeypair);
-    if (CHIP_NO_ERROR == error)
-    {
-        mInitialized = true;
-    }
-    return error;
-#else
     sss_status_t status    = kStatus_SSS_Fail;
     sss_object_t keyObject = { 0 };
     uint8_t pubkey[128]    = {
@@ -127,7 +110,8 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
 
     if (key_target == ECPKeyTarget::ECDH)
     {
-        keyid = kKeyId_case_ephemeral_keyid;
+        keyid = 0; // Use host for ECDH
+        // keyid = kKeyId_case_ephemeral_keyid;
     }
     else
     {
@@ -195,16 +179,12 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
     mInitialized = true;
 
     return CHIP_NO_ERROR;
-#endif // ENABLE_SE05X_GENERATE_EC_KEY
 }
 
-CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P256ECDSASignature & out_signature) const
+CHIP_ERROR P256KeypairSE05x::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P256ECDSASignature & out_signature) const
 {
     VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
 
-#if !ENABLE_SE05X_GENERATE_EC_KEY
-    return ECDSA_sign_msg_H(&mKeypair, msg, msg_length, out_signature);
-#else
     CHIP_ERROR error                  = CHIP_ERROR_INTERNAL;
     uint32_t keyid                    = 0;
     sss_asymmetric_t asymm_ctx        = { 0 };
@@ -248,9 +228,10 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P
     VerifyOrExit(status == kStatus_SSS_Success, error = CHIP_ERROR_INTERNAL);
 
     error = EcdsaAsn1SignatureToRaw(kP256_FE_Length, ByteSpan{ signature_se05x, signature_se05x_len }, out_raw_sig_span);
-    SuccessOrExit(error);
+    VerifyOrExit(error == CHIP_NO_ERROR, error = CHIP_ERROR_INTERNAL);
 
-    TEMPORARY_RETURN_IGNORED out_signature.SetLength(2 * kP256_FE_Length);
+    error = out_signature.SetLength(2 * kP256_FE_Length);
+    VerifyOrExit(error == CHIP_NO_ERROR, error = CHIP_ERROR_INTERNAL);
 
     error = CHIP_NO_ERROR;
 exit:
@@ -259,10 +240,9 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P
         sss_asymmetric_context_free(&asymm_ctx);
     }
     return error;
-#endif // ENABLE_SE05X_GENERATE_EC_KEY
 }
 
-CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
+CHIP_ERROR P256KeypairSE05x::Serialize(P256SerializedKeypair & output) const
 {
     const size_t len = output.Length() == 0 ? output.Capacity() : output.Length();
     Encoding::BufferWriter bbuf(output.Bytes(), len);
@@ -281,13 +261,12 @@ CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
     bbuf.Put(mKeypair.mBytes, kP256_PrivateKey_Length);
 
     VerifyOrReturnError(bbuf.Fit(), CHIP_ERROR_BUFFER_TOO_SMALL);
-
     TEMPORARY_RETURN_IGNORED output.SetLength(bbuf.Needed());
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR P256Keypair::Deserialize(P256SerializedKeypair & input)
+CHIP_ERROR P256KeypairSE05x::Deserialize(P256SerializedKeypair & input)
 {
     CHIP_ERROR error = CHIP_ERROR_INTERNAL;
     const uint8_t * privkey;
@@ -328,13 +307,10 @@ CHIP_ERROR P256Keypair::Deserialize(P256SerializedKeypair & input)
     }
 }
 
-CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const
+CHIP_ERROR P256KeypairSE05x::ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const
 {
     VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
 
-#if !ENABLE_SE05X_GENERATE_EC_KEY
-    return ECDH_derive_secret_H(&mKeypair, remote_public_key, out_secret);
-#else
     size_t secret_length = (out_secret.Length() == 0) ? out_secret.Capacity() : out_secret.Length();
     uint32_t keyid       = 0;
 
@@ -360,8 +336,6 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
     VerifyOrReturnError(smstatus == SM_OK, CHIP_ERROR_INTERNAL);
 
     return out_secret.SetLength(secret_length);
-
-#endif // ENABLE_SE05X_GENERATE_EC_KEY
 }
 
 /* EC Public key HSM implementation */
@@ -401,12 +375,9 @@ CHIP_ERROR SE05X_Set_ECDSA_Public_Key(sss_object_t * keyObject, const uint8_t *
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR P256PublicKey::ECDSA_validate_msg_signature(const uint8_t * msg, size_t msg_length,
-                                                       const P256ECDSASignature & signature) const
+CHIP_ERROR P256PublicKeySE05x::ECDSA_validate_msg_signature(const uint8_t * msg, size_t msg_length,
+                                                            const P256ECDSASignature & signature) const
 {
-#if !ENABLE_SE05X_ECDSA_VERIFY
-    return ECDSA_validate_msg_signature_H(this, msg, msg_length, signature);
-#else
     CHIP_ERROR error           = CHIP_ERROR_INTERNAL;
     sss_status_t status        = kStatus_SSS_Success;
     sss_asymmetric_t asymm_ctx = { 0 };
@@ -460,16 +431,11 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_msg_signature(const uint8_t * msg, size
     }
 
     return error;
-
-#endif // ENABLE_SE05X_ECDSA_VERIFY
 }
 
-CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, size_t hash_length,
-                                                        const P256ECDSASignature & signature) const
+CHIP_ERROR P256PublicKeySE05x::ECDSA_validate_hash_signature(const uint8_t * hash, size_t hash_length,
+                                                             const P256ECDSASignature & signature) const
 {
-#if !ENABLE_SE05X_ECDSA_VERIFY
-    return ECDSA_validate_hash_signature_H(this, hash, hash_length, signature);
-#else
     CHIP_ERROR error                                         = CHIP_ERROR_INTERNAL;
     sss_status_t status                                      = kStatus_SSS_Success;
     sss_asymmetric_t asymm_ctx                               = { 0 };
@@ -517,11 +483,8 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, si
     }
 
     return error;
-
-#endif // ENABLE_SE05X_ECDSA_VERIFY
 }
 
-#if ENABLE_SE05X_GENERATE_EC_KEY
 static int add_tlv(uint8_t * buf, size_t buf_index, uint8_t tag, size_t len, uint8_t * val, size_t bufLen)
 {
     VerifyOrReturnError(bufLen >= 2, -1);
@@ -532,7 +495,7 @@ static int add_tlv(uint8_t * buf, size_t buf_index, uint8_t tag, size_t len, uin
     buf[buf_index++] = (uint8_t) len;
     if (len > 0 && val != NULL)
     {
-        VerifyOrReturnError(buf_index < bufLen, -1);
+        VerifyOrReturnError(buf_index + len <= bufLen, -1);
         memcpy(&buf[buf_index], val, len);
         VerifyOrReturnError((SIZE_MAX - len) >= buf_index, -1);
         buf_index = buf_index + len;
@@ -540,7 +503,6 @@ static int add_tlv(uint8_t * buf, size_t buf_index, uint8_t tag, size_t len, uin
 
     return 0;
 }
-#endif // #if ENABLE_SE05X_GENERATE_EC_KEY
 
 /*
  * CSR format used in the below function,
@@ -574,11 +536,8 @@ static int add_tlv(uint8_t * buf, size_t buf_index, uint8_t tag, size_t len, uin
  *
  */
 
-CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * csr, size_t & csr_length) const
+CHIP_ERROR P256KeypairSE05x::NewCertificateSigningRequest(uint8_t * csr, size_t & csr_length) const
 {
-#if !ENABLE_SE05X_GENERATE_EC_KEY
-    return NewCertificateSigningRequest_H(&mKeypair, csr, csr_length);
-#else
     CHIP_ERROR error           = CHIP_ERROR_INTERNAL;
     sss_status_t status        = kStatus_SSS_Success;
     sss_asymmetric_t asymm_ctx = { 0 };
@@ -756,8 +715,6 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * csr, size_t & csr
     }
 
     return error;
-
-#endif // ENABLE_SE05X_GENERATE_EC_KEY
 }
 
 } // namespace Crypto
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_pbkdf.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_pbkdf.cpp
index 5b9d8c845d3..ec3845accc5 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_pbkdf.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_pbkdf.cpp
@@ -28,15 +28,9 @@
 namespace chip {
 namespace Crypto {
 
-extern CHIP_ERROR pbkdf2_sha256_h(const uint8_t * password, size_t plen, const uint8_t * salt, size_t slen,
-                                  unsigned int iteration_count, uint32_t key_length, uint8_t * output);
-
-CHIP_ERROR PBKDF2_sha256::pbkdf2_sha256(const uint8_t * password, size_t plen, const uint8_t * salt, size_t slen,
-                                        unsigned int iteration_count, uint32_t key_length, uint8_t * output)
+CHIP_ERROR PBKDF2_sha256_SE05x::pbkdf2_sha256(const uint8_t * password, size_t plen, const uint8_t * salt, size_t slen,
+                                              unsigned int iteration_count, uint32_t key_length, uint8_t * output)
 {
-#if !ENABLE_SE05X_PBKDF2_SHA256
-    return pbkdf2_sha256_h(password, plen, salt, slen, iteration_count, key_length, output);
-#else
     CHIP_ERROR error = CHIP_ERROR_INTERNAL;
     VerifyOrReturnError(password != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(plen > 0, CHIP_ERROR_INVALID_ARGUMENT);
@@ -101,8 +95,6 @@ CHIP_ERROR PBKDF2_sha256::pbkdf2_sha256(const uint8_t * password, size_t plen, c
     }
 
     return error;
-
-#endif // ENABLE_SE05X_PBKDF2_SHA256
 }
 
 } // namespace Crypto
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_rng.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_rng.cpp
index 7b5e69e8e69..83365b7a62b 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_rng.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_rng.cpp
@@ -27,85 +27,13 @@
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 
-#if !ENABLE_SE05X_RND_GEN
-
-typedef struct
-{
-    bool mInitialized;
-    bool mDRBGSeeded;
-    mbedtls_ctr_drbg_context mDRBGCtxt;
-    mbedtls_entropy_context mEntropy;
-} EntropyContext_h;
-
-static EntropyContext_h gsEntropyContext_h;
-
-static EntropyContext_h * get_entropy_context()
-{
-    if (!gsEntropyContext_h.mInitialized)
-    {
-        mbedtls_entropy_init(&gsEntropyContext_h.mEntropy);
-        mbedtls_ctr_drbg_init(&gsEntropyContext_h.mDRBGCtxt);
-
-        gsEntropyContext_h.mInitialized = true;
-    }
-
-    return &gsEntropyContext_h;
-}
-
-static mbedtls_ctr_drbg_context * get_drbg_context()
-{
-    EntropyContext_h * const context = get_entropy_context();
-
-    mbedtls_ctr_drbg_context * const drbgCtxt = &context->mDRBGCtxt;
-
-    if (!context->mDRBGSeeded)
-    {
-        const int status = mbedtls_ctr_drbg_seed(drbgCtxt, mbedtls_entropy_func, &context->mEntropy, nullptr, 0);
-        if (status != 0)
-        {
-            return nullptr;
-        }
-
-        context->mDRBGSeeded = true;
-    }
-
-    return drbgCtxt;
-}
-
-void free_entropy_context_h()
-{
-    if (gsEntropyContext_h.mInitialized)
-    {
-        mbedtls_entropy_free(&gsEntropyContext_h.mEntropy);
-        mbedtls_ctr_drbg_free(&gsEntropyContext_h.mDRBGCtxt);
-        gsEntropyContext_h.mInitialized = false;
-    }
-}
-
-#endif // #if !ENABLE_SE05X_RND_GEN
-
 namespace chip {
 namespace Crypto {
 
-#if !ENABLE_SE05X_RND_GEN
-CHIP_ERROR DRBG_get_bytes_h(uint8_t * out_buffer, const size_t out_length)
-{
-    VerifyOrReturnError(out_buffer != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-
-    mbedtls_ctr_drbg_context * const drbg_ctxt = get_drbg_context();
-    VerifyOrReturnError(drbg_ctxt != nullptr, CHIP_ERROR_INTERNAL);
-
-    const int result = mbedtls_ctr_drbg_random(drbg_ctxt, Uint8::to_uchar(out_buffer), out_length);
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-#endif //! ENABLE_SE05X_RND_GEN
+#if ENABLE_SE05X_RND_GEN
 
 CHIP_ERROR DRBG_get_bytes(uint8_t * out_buffer, const size_t out_length)
 {
-#if ENABLE_SE05X_RND_GEN
     sss_status_t status;
     sss_rng_context_t ctx_rng = { 0 };
 
@@ -125,10 +53,9 @@ CHIP_ERROR DRBG_get_bytes(uint8_t * out_buffer, const size_t out_length)
     sss_rng_context_free(&ctx_rng);
 
     return CHIP_NO_ERROR;
-#else
-    return DRBG_get_bytes_h(out_buffer, out_length);
-#endif
 }
 
+#endif
+
 } // namespace Crypto
 } // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp
index 80ef4933c8b..de619a204ab 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp
@@ -36,6 +36,115 @@ const uint32_t w0in_id_p = 0x7D200003;
 const uint32_t w1in_id_p = 0x7D200004;
 #endif
 
+#if ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+static CHIP_ERROR get_trust_provisioned_w0L_ids(uint32_t * tp_w0in_id_v, uint32_t * tp_Lin_id_v)
+{
+
+    switch (SE05X_SPAKE_VERIFIER_TP_SET_NO)
+    {
+    case 1: {
+        if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 1000)
+        {
+            *tp_w0in_id_v = 0x7FFF2011;
+            *tp_Lin_id_v  = 0x7FFF2021;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 5000)
+        {
+            *tp_w0in_id_v = 0x7FFF2012;
+            *tp_Lin_id_v  = 0x7FFF2022;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 10000)
+        {
+            *tp_w0in_id_v = 0x7FFF2013;
+            *tp_Lin_id_v  = 0x7FFF2023;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 50000)
+        {
+            *tp_w0in_id_v = 0x7FFF2014;
+            *tp_Lin_id_v  = 0x7FFF2024;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 100000)
+        {
+            *tp_w0in_id_v = 0x7FFF2015;
+            *tp_Lin_id_v  = 0x7FFF2025;
+        }
+        else
+        {
+            return CHIP_ERROR_INTERNAL;
+        }
+    }
+    break;
+    case 2: {
+        if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 1000)
+        {
+            *tp_w0in_id_v = 0x7FFF2016;
+            *tp_Lin_id_v  = 0x7FFF2026;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 5000)
+        {
+            *tp_w0in_id_v = 0x7FFF2017;
+            *tp_Lin_id_v  = 0x7FFF2027;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 10000)
+        {
+            *tp_w0in_id_v = 0x7FFF2018;
+            *tp_Lin_id_v  = 0x7FFF2028;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 50000)
+        {
+            *tp_w0in_id_v = 0x7FFF2019;
+            *tp_Lin_id_v  = 0x7FFF2029;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 100000)
+        {
+            *tp_w0in_id_v = 0x7FFF201A;
+            *tp_Lin_id_v  = 0x7FFF202A;
+        }
+        else
+        {
+            return CHIP_ERROR_INTERNAL;
+        }
+    }
+    break;
+    case 3: {
+        if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 1000)
+        {
+            *tp_w0in_id_v = 0x7FFF201B;
+            *tp_Lin_id_v  = 0x7FFF202B;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 5000)
+        {
+            *tp_w0in_id_v = 0x7FFF201C;
+            *tp_Lin_id_v  = 0x7FFF202C;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 10000)
+        {
+            *tp_w0in_id_v = 0x7FFF201D;
+            *tp_Lin_id_v  = 0x7FFF202D;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 50000)
+        {
+            *tp_w0in_id_v = 0x7FFF201E;
+            *tp_Lin_id_v  = 0x7FFF202E;
+        }
+        else if (SE05X_SPAKE_VERIFIER_TP_ITER_CNT == 100000)
+        {
+            *tp_w0in_id_v = 0x7FFF201F;
+            *tp_Lin_id_v  = 0x7FFF202F;
+        }
+        else
+        {
+            return CHIP_ERROR_INTERNAL;
+        }
+    }
+    break;
+    default:
+        return CHIP_ERROR_INTERNAL;
+    }
+    return CHIP_NO_ERROR;
+}
+#endif
+
 void Spake2p_Finish_HSM(hsm_pake_context_t * phsm_pake_context)
 {
 #if ENABLE_REENTRANCY
@@ -233,10 +342,12 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::BeginVerifier(const uint8_t * my_id
                                                            const uint8_t * w0in, size_t w0in_len, const uint8_t * Lin,
                                                            size_t Lin_len)
 {
+#if !ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
     uint8_t w0in_mod[32] = {
         0,
     };
     size_t w0in_mod_len = 32;
+#endif
     smStatus_t smstatus = SM_NOT_OK;
 
     VerifyOrReturnError(w0in != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -253,8 +364,10 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::BeginVerifier(const uint8_t * my_id
 
     ChipLogProgress(Crypto, "SE05x: HSM - BeginVerifier");
 
+#if !ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
     ReturnErrorOnFailure(FELoad(w0in, w0in_len, w0));
     ReturnErrorOnFailure(FEWrite(w0, w0in_mod, w0in_mod_len));
+#endif
     ReturnErrorOnFailure(create_init_crypto_obj(chip::Crypto::CHIP_SPAKE2P_ROLE::VERIFIER, &hsm_pake_context));
 
     smstatus = Se05x_API_PAKEConfigDevice(&((sss_se05x_session_t *) &gex_sss_chip_ctx.session)->s_ctx,
@@ -262,8 +375,10 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::BeginVerifier(const uint8_t * my_id
                                           SE05x_SPAKE2PLUS_DEVICE_TYPE_B);
     VerifyOrReturnError(smstatus == SM_OK, CHIP_ERROR(chip::ChipError::Range::kPlatform, smstatus));
 
+#if !ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
     ReturnErrorOnFailure(se05x_set_key_for_spake(w0in_id_v, w0in_mod, w0in_mod_len, kSSS_KeyPart_Default, kSSS_CipherType_HMAC));
     ReturnErrorOnFailure(se05x_set_key_for_spake(Lin_id_v, Lin, Lin_len, kSSS_KeyPart_Default, kSSS_CipherType_HMAC));
+#endif
 
     smstatus = Se05x_API_PAKEInitDevice(&((sss_se05x_session_t *) &gex_sss_chip_ctx.session)->s_ctx,
                                         static_cast<SE05x_CryptoObjectID_t>(hsm_pake_context.spake_objId),
@@ -271,10 +386,26 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::BeginVerifier(const uint8_t * my_id
                                         (uint8_t *) peer_identity, peer_identity_len, (uint8_t *) my_identity, my_identity_len);
     VerifyOrReturnError(smstatus == SM_OK, CHIP_ERROR(chip::ChipError::Range::kPlatform, smstatus));
 
+#if ENABLE_SE05X_SPAKE_VERIFIER_USE_TP_VALUES
+    /* Using TP values.*/
+    uint32_t tp_w0in_id_v = 0;
+    uint32_t tp_Lin_id_v  = 0;
+    CHIP_ERROR err        = get_trust_provisioned_w0L_ids(SE05X_SPAKE_VERIFIER_TP_ITER_CNT, &tp_w0in_id_v, &tp_Lin_id_v);
+    if (CHIP_NO_ERROR != err)
+    {
+        ChipLogProgress(Crypto, "SE05x: Error in getting W0 and L TP ids");
+        return err;
+    }
+
+    smstatus = Se05x_API_PAKEInitCredentials(&((sss_se05x_session_t *) &gex_sss_chip_ctx.session)->s_ctx,
+                                             static_cast<SE05x_CryptoObjectID_t>(hsm_pake_context.spake_objId), tp_w0in_id_v, 0,
+                                             tp_Lin_id_v);
+#else
     smstatus =
         Se05x_API_PAKEInitCredentials(&((sss_se05x_session_t *) &gex_sss_chip_ctx.session)->s_ctx,
                                       static_cast<SE05x_CryptoObjectID_t>(hsm_pake_context.spake_objId), w0in_id_v, 0, Lin_id_v);
     VerifyOrReturnError(smstatus == SM_OK, CHIP_ERROR(chip::ChipError::Range::kPlatform, smstatus));
+#endif
 
     state = CHIP_SPAKE2P_STATE::STARTED;
     role  = CHIP_SPAKE2P_ROLE::VERIFIER;
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp
index 62ae4d3710f..8c0920f8145 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp
@@ -24,7 +24,6 @@
 
 #include "CHIPCryptoPALHsm_se05x_utils.h"
 #include "fsl_sss_policy.h"
-#include "se05x_host_gpio.h"
 
 ex_sss_boot_ctx_t gex_sss_chip_ctx;
 static int is_session_open = 0;
@@ -86,9 +85,9 @@ CHIP_ERROR se05x_session_open(void)
     }
 
     ChipLogDetail(Crypto, "Turn ON SE05x secure element before session open");
-    if (se05x_host_gpio_set_value(1) != 0)
+    if (se05x_host_gpio_power_set(1) != 0)
     {
-        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_set_value(1) function");
+        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_power_set(1) function");
         return CHIP_ERROR_INTERNAL;
     }
 
@@ -120,10 +119,6 @@ CHIP_ERROR se05x_session_open(void)
     return CHIP_NO_ERROR;
 }
 
-#if !ENABLE_SE05X_RND_GEN
-extern void free_entropy_context_h();
-#endif
-
 /* Close session to se05x */
 CHIP_ERROR se05x_close_session(void)
 {
@@ -139,21 +134,17 @@ CHIP_ERROR se05x_close_session(void)
     }
 
     ChipLogDetail(Crypto, "Turn OFF SE05x secure element after session close");
-    if (se05x_host_gpio_set_value(0) != 0)
+    if (se05x_host_gpio_power_set(0) != 0)
     {
-        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_set_value(0) function");
+        ChipLogError(NotSpecified, "SE05x - Error in se05x_host_gpio_power_set(0) function");
         return CHIP_ERROR_INTERNAL;
     }
 
-#if !ENABLE_SE05X_RND_GEN
-    free_entropy_context_h();
-#endif
-
     return CHIP_NO_ERROR;
 }
 
 /* Check if key exists in se05x */
-CHIP_ERROR se05x_check_object_exists(uint32_t keyid)
+CHIP_ERROR se05x_check_object_exists(uint32_t keyid, bool * key_exists)
 {
     smStatus_t smstatus   = SM_NOT_OK;
     SE05x_Result_t exists = kSE05x_Result_NA;
@@ -174,9 +165,11 @@ CHIP_ERROR se05x_check_object_exists(uint32_t keyid)
         }
         if (exists == kSE05x_Result_FAILURE)
         {
-            ChipLogError(Crypto, "se05x warn: Key doesnot exists");
-            return CHIP_ERROR_INTERNAL;
+            ChipLogDetail(Crypto, "se05x warn: Key doesnot exists");
+            *key_exists = false;
+            return CHIP_NO_ERROR;
         }
+        *key_exists = true;
     }
 
     return CHIP_NO_ERROR;
@@ -353,6 +346,25 @@ CHIP_ERROR se05x_set_binary_data(uint32_t keyId, const uint8_t * buf, size_t buf
     return CHIP_NO_ERROR;
 }
 
+/* Set EC key in se05x */
+CHIP_ERROR se05x_set_ec_key(uint32_t keyId, const uint8_t * buf, size_t buflen)
+{
+    sss_object_t keyObject = { 0 };
+    sss_status_t status    = kStatus_SSS_Fail;
+
+    status = sss_key_object_init(&keyObject, &gex_sss_chip_ctx.ks);
+    VerifyOrReturnError(status == kStatus_SSS_Success, CHIP_ERROR_INTERNAL);
+
+    status = sss_key_object_allocate_handle(&keyObject, keyId, kSSS_KeyPart_Pair, kSSS_CipherType_EC_NIST_P, buflen,
+                                            kKeyObject_Mode_Persistent);
+    VerifyOrReturnError(status == kStatus_SSS_Success, CHIP_ERROR_INTERNAL);
+
+    status = sss_key_store_set_key(&gex_sss_chip_ctx.ks, &keyObject, buf, buflen, 256, NULL, 0);
+    VerifyOrReturnError(status == kStatus_SSS_Success, CHIP_ERROR_INTERNAL);
+
+    return CHIP_NO_ERROR;
+}
+
 /* Perform internal sign in se05x (only on SE051H) */
 CHIP_ERROR se05x_perform_internal_sign(uint32_t keyId, uint8_t * sigBuf, size_t * sigBufLen)
 {
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h
index a865fa55030..67f3474fb29 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h
@@ -19,20 +19,22 @@
 
 #include <string.h>
 
-#include <CHIPCryptoPAL_se05x.h>
 #include <crypto/CHIPCryptoPAL.h>
+#include <platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h>
 #include <type_traits>
 
-#include <CHIPCryptoPALHsm_se05x_config.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/BufferWriter.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h>
 #include <system/SystemMutex.h>
 
 /* se05x includes */
 #include "ex_sss_boot.h"
-#include "fsl_sss_api.h"
+#include "se051h_nfc_comm_prov.h"
+#include "se05x_host_gpio.h"
+#include "sss/inc/fsl_sss_api.h"
 #include <fsl_sss_se05x_apis.h>
 #include <se05x_APDU.h>
 
@@ -78,12 +80,19 @@ extern "C" {
  */
 CHIP_ERROR se05x_session_open(void);
 
+/**
+ * @brief Close session to se05x secure element.
+ * @return CHIP_ERROR_INTERNAL on error, CHIP_NO_ERROR otherwise
+ */
+CHIP_ERROR se05x_close_session(void);
+
 /**
  * @brief Check if key exists in se05x.
  * @param[in] Key id of the key to be checked.
+ * @param[out] key_exists boolean true if the key id presents.
  * @return CHIP_ERROR_INTERNAL on error, CHIP_NO_ERROR otherwise
  */
-CHIP_ERROR se05x_check_object_exists(uint32_t keyid);
+CHIP_ERROR se05x_check_object_exists(uint32_t keyid, bool * key_exists);
 
 /**
  * @brief Delete the key in se05x.
@@ -132,6 +141,16 @@ CHIP_ERROR se05x_set_certificate(uint32_t keyId, const uint8_t * buf, size_t buf
  */
 CHIP_ERROR se05x_set_binary_data(uint32_t keyId, const uint8_t * buf, size_t buflen);
 
+/**
+ * @brief Set EC key in se05x.
+ * The Key is stored with Persistent option.
+ * @param[in] keyid - Key id of the object.
+ * @param[in] buf - Buffer containing Key data.
+ * @param[in] buflen - Buffer length.
+ * @return CHIP_ERROR_INTERNAL on error, CHIP_NO_ERROR otherwise
+ */
+CHIP_ERROR se05x_set_ec_key(uint32_t keyId, const uint8_t * buf, size_t buflen);
+
 /**
  * @brief Perform internal sign in se05x (only on SE051H).
  * Used to Perform ECDSA internal sign
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_HostFallBack.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_HostFallBack.cpp
index eb1e009d534..24e910f5701 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_HostFallBack.cpp
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_HostFallBack.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <crypto/CHIPCryptoPAL.h>
+#include <crypto/CHIPCryptoPALmbedTLS.h>
 
 #include <type_traits>
 
@@ -58,52 +59,11 @@
 namespace chip {
 namespace Crypto {
 
-#define MAX_ERROR_STR_LEN 128
-#define NUM_BYTES_IN_SHA256_HASH 32
-
-// In mbedTLS 3.0.0 direct access to structure fields was replaced with using MBEDTLS_PRIVATE macro.
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000)
-#define CHIP_CRYPTO_PAL_PRIVATE(x) MBEDTLS_PRIVATE(x)
-#else
-#define CHIP_CRYPTO_PAL_PRIVATE(x) x
-#endif
-
-#if (MBEDTLS_VERSION_NUMBER >= 0x03000000 && MBEDTLS_VERSION_NUMBER < 0x03010000)
-#define CHIP_CRYPTO_PAL_PRIVATE_X509(x) MBEDTLS_PRIVATE(x)
-#else
-#define CHIP_CRYPTO_PAL_PRIVATE_X509(x) x
-#endif
-
-static void _log_mbedTLS_error(int error_code)
-{
-    if (error_code != 0)
-    {
-#if defined(MBEDTLS_ERROR_C)
-        char error_str[MAX_ERROR_STR_LEN];
-        mbedtls_strerror(error_code, error_str, sizeof(error_str));
-        ChipLogError(Crypto, "mbedTLS error: %s", error_str);
-#else
-        // Error codes defined in 16-bit negative hex numbers. Ease lookup by printing likewise
-        ChipLogError(Crypto, "mbedTLS error: -0x%04X", -static_cast<uint16_t>(error_code));
-#endif
-    }
-}
-
-static_assert(kMAX_Hash_SHA256_Context_Size >= sizeof(mbedtls_sha256_context),
-              "kMAX_Hash_SHA256_Context_Size is too small for the size of underlying mbedtls_sha256_context");
-
-static inline mbedtls_sha256_context * to_inner_hash_sha256_context(HashSHA256OpaqueContext * context)
-{
-    return SafePointerCast<mbedtls_sha256_context *>(context);
-}
-
 static int CryptoRNG(void * ctxt, uint8_t * out_buffer, size_t out_length)
 {
     return (chip::Crypto::DRBG_get_bytes(out_buffer, out_length) == CHIP_NO_ERROR) ? 0 : 1;
 }
 
-extern mbedtls_ecp_group_id MapECPGroupId(SupportedECPKeyTypes keyType);
-
 static inline mbedtls_ecp_keypair * to_keypair(P256KeypairContext * context)
 {
     return SafePointerCast<mbedtls_ecp_keypair *>(context);
@@ -114,11 +74,6 @@ static inline const mbedtls_ecp_keypair * to_const_keypair(const P256KeypairCont
     return SafePointerCast<const mbedtls_ecp_keypair *>(context);
 }
 
-void ClearSecretData(uint8_t * buf, size_t len)
-{
-    mbedtls_platform_zeroize(buf, len);
-}
-
 CHIP_ERROR Initialize_H(P256Keypair * pk, P256PublicKey * mPublicKey, P256KeypairContext * mKeypair)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
@@ -263,79 +218,6 @@ CHIP_ERROR ECDH_derive_secret_H(P256KeypairContext * mKeypair, const P256PublicK
 #endif
 }
 
-CHIP_ERROR ECDSA_validate_hash_signature_H(const P256PublicKey * public_key, const uint8_t * hash, const size_t hash_length,
-                                           const P256ECDSASignature & signature)
-{
-#if defined(MBEDTLS_ECDSA_C)
-    VerifyOrReturnError(hash != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(hash_length == kSHA256_Hash_Length, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(signature.Length() == kP256_ECDSA_Signature_Length_Raw, CHIP_ERROR_INVALID_ARGUMENT);
-
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-    mbedtls_mpi r, s;
-
-    mbedtls_mpi_init(&r);
-    mbedtls_mpi_init(&s);
-
-    mbedtls_ecp_keypair keypair;
-    mbedtls_ecp_keypair_init(&keypair);
-
-    mbedtls_ecdsa_context ecdsa_ctxt;
-    mbedtls_ecdsa_init(&ecdsa_ctxt);
-
-    result = mbedtls_ecp_group_load(&keypair.CHIP_CRYPTO_PAL_PRIVATE(grp), MapECPGroupId(public_key->Type()));
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    result = mbedtls_ecp_point_read_binary(&keypair.CHIP_CRYPTO_PAL_PRIVATE(grp), &keypair.CHIP_CRYPTO_PAL_PRIVATE(Q),
-                                           Uint8::to_const_uchar(*public_key), public_key->Length());
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    result = mbedtls_ecdsa_from_keypair(&ecdsa_ctxt, &keypair);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    // Read the <r, s> big nums from the signature
-    result = mbedtls_mpi_read_binary(&r, Uint8::to_const_uchar(signature.ConstBytes()) + 0u, kP256_FE_Length);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_mpi_read_binary(&s, Uint8::to_const_uchar(signature.ConstBytes()) + kP256_FE_Length, kP256_FE_Length);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_ecdsa_verify(&ecdsa_ctxt.CHIP_CRYPTO_PAL_PRIVATE(grp), Uint8::to_const_uchar(hash), hash_length,
-                                  &ecdsa_ctxt.CHIP_CRYPTO_PAL_PRIVATE(Q), &r, &s);
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INVALID_SIGNATURE);
-
-exit:
-    mbedtls_ecdsa_free(&ecdsa_ctxt);
-    mbedtls_ecp_keypair_free(&keypair);
-    mbedtls_mpi_free(&s);
-    mbedtls_mpi_free(&r);
-    _log_mbedTLS_error(result);
-    return error;
-#else
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-CHIP_ERROR ECDSA_validate_msg_signature_H(const P256PublicKey * public_key, const uint8_t * msg, const size_t msg_length,
-                                          const P256ECDSASignature & signature)
-{
-#if defined(MBEDTLS_ECDSA_C)
-    VerifyOrReturnError((msg != nullptr) && (msg_length > 0), CHIP_ERROR_INVALID_ARGUMENT);
-
-    uint8_t digest[kSHA256_Hash_Length];
-    memset(&digest[0], 0, sizeof(digest));
-    ReturnErrorOnFailure(Hash_SHA256(msg, msg_length, &digest[0]));
-
-    return ECDSA_validate_hash_signature_H(public_key, &digest[0], sizeof(digest), signature);
-#else
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
 CHIP_ERROR NewCertificateSigningRequest_H(P256KeypairContext * mKeypair, uint8_t * out_csr, size_t & csr_length)
 {
 #if defined(MBEDTLS_X509_CSR_WRITE_C)
@@ -465,99 +347,5 @@ CHIP_ERROR Deserialize_H(P256Keypair * pk, P256PublicKey * mPublicKey, P256Keypa
     return error;
 }
 
-CHIP_ERROR HKDF_SHA256_H(const uint8_t * secret, const size_t secret_length, const uint8_t * salt, const size_t salt_length,
-                         const uint8_t * info, const size_t info_length, uint8_t * out_buffer, size_t out_length)
-{
-    VerifyOrReturnError(secret != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(secret_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-
-    // Salt is optional
-    if (salt_length > 0)
-    {
-        VerifyOrReturnError(salt != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    }
-
-    VerifyOrReturnError(info_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(info != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_buffer != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    const mbedtls_md_info_t * const md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-    VerifyOrReturnError(md != nullptr, CHIP_ERROR_INTERNAL);
-
-    const int result = mbedtls_hkdf(md, Uint8::to_const_uchar(salt), salt_length, Uint8::to_const_uchar(secret), secret_length,
-                                    Uint8::to_const_uchar(info), info_length, Uint8::to_uchar(out_buffer), out_length);
-    _log_mbedTLS_error(result);
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR pbkdf2_sha256_h(const uint8_t * password, size_t plen, const uint8_t * salt, size_t slen, unsigned int iteration_count,
-                           uint32_t key_length, uint8_t * output)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
-    const mbedtls_md_info_t * md_info;
-    mbedtls_md_context_t md_ctxt;
-    constexpr int use_hmac = 1;
-
-    bool free_md_ctxt = false;
-
-    VerifyOrExit(password != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(plen > 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(salt != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(slen >= kSpake2p_Min_PBKDF_Salt_Length, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(slen <= kSpake2p_Max_PBKDF_Salt_Length, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(key_length > 0, error = CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(output != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-    VerifyOrExit(md_info != nullptr, error = CHIP_ERROR_INTERNAL);
-
-    mbedtls_md_init(&md_ctxt);
-    free_md_ctxt = true;
-
-    result = mbedtls_md_setup(&md_ctxt, md_info, use_hmac);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    result = mbedtls_pkcs5_pbkdf2_hmac(&md_ctxt, Uint8::to_const_uchar(password), plen, Uint8::to_const_uchar(salt), slen,
-                                       iteration_count, key_length, Uint8::to_uchar(output));
-
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-exit:
-    _log_mbedTLS_error(result);
-
-    if (free_md_ctxt)
-    {
-        mbedtls_md_free(&md_ctxt);
-    }
-
-    return error;
-}
-
-CHIP_ERROR HMAC_SHA256_h(const uint8_t * key, size_t key_length, const uint8_t * message, size_t message_length,
-                         uint8_t * out_buffer, size_t out_length)
-{
-    VerifyOrReturnError(key != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(key_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(message != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(message_length > 0, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_length >= kSHA256_Hash_Length, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_buffer != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    const mbedtls_md_info_t * const md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-    VerifyOrReturnError(md != nullptr, CHIP_ERROR_INTERNAL);
-
-    const int result =
-        mbedtls_md_hmac(md, Uint8::to_const_uchar(key), key_length, Uint8::to_const_uchar(message), message_length, out_buffer);
-
-    _log_mbedTLS_error(result);
-    VerifyOrReturnError(result == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
 } // namespace Crypto
 } // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h
index 58a95ae531f..ddde17a6426 100644
--- a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h
+++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "CHIPCryptoPALHsm_se05x_config.h"
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/DataModelTypes.h>
+#include <platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_config.h>
 
 #if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER))
 typedef struct hsm_pake_context_s
@@ -80,5 +80,96 @@ class Spake2pHSM_P256_SHA256_HKDF_HMAC : public Spake2p_P256_SHA256_HKDF_HMAC
 
 #endif // #if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER))
 
+/**
+ * @brief P256 derived class to use SE05x secure element for P256 Operations.
+ *
+ */
+class P256KeypairSE05x : public P256Keypair
+{
+public:
+    ~P256KeypairSE05x() override;
+    CHIP_ERROR Initialize(ECPKeyTarget key_target) override;
+    CHIP_ERROR Serialize(P256SerializedKeypair & output) const override;
+    CHIP_ERROR Deserialize(P256SerializedKeypair & input) override;
+    CHIP_ERROR NewCertificateSigningRequest(uint8_t * csr, size_t & csr_length) const override;
+    CHIP_ERROR ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P256ECDSASignature & out_signature) const override;
+    CHIP_ERROR ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const override;
+};
+
+class P256PublicKeySE05x final // final due to being copyable
+    : public ECPKey<P256ECDSASignature>
+{
+public:
+    P256PublicKeySE05x() = default;
+
+    template <size_t N>
+    constexpr P256PublicKeySE05x(const uint8_t (&raw_value)[N])
+    {
+        static_assert(N == kP256_PublicKey_Length, "Can only array-initialize from proper bounds");
+        memcpy(&bytes[0], &raw_value[0], N);
+    }
+
+    template <size_t N>
+    constexpr P256PublicKeySE05x(const FixedByteSpan<N> & value)
+    {
+        static_assert(N == kP256_PublicKey_Length, "Can only initialize from proper sized byte span");
+        memcpy(&bytes[0], value.data(), N);
+    }
+
+    template <size_t N>
+    P256PublicKeySE05x & operator=(const FixedByteSpan<N> & value)
+    {
+        static_assert(N == kP256_PublicKey_Length, "Can only initialize from proper sized byte span");
+        memcpy(&bytes[0], value.data(), N);
+        return *this;
+    }
+
+    SupportedECPKeyTypes Type() const override { return SupportedECPKeyTypes::ECP256R1; }
+    size_t Length() const override { return kP256_PublicKey_Length; }
+    operator uint8_t *() override { return bytes; }
+    operator const uint8_t *() const override { return bytes; }
+    const uint8_t * ConstBytes() const override { return &bytes[0]; }
+    uint8_t * Bytes() override { return &bytes[0]; }
+    bool IsUncompressed() const override
+    {
+        constexpr uint8_t kUncompressedPointMarker = 0x04;
+        // SEC1 definition of an uncompressed point is (0x04 || X || Y) where X and Y are
+        // raw zero-padded big-endian large integers of the group size.
+        return (Length() == ((kP256_FE_Length * 2) + 1)) && (ConstBytes()[0] == kUncompressedPointMarker);
+    }
+
+    CHIP_ERROR ECDSA_validate_msg_signature(const uint8_t * msg, size_t msg_length,
+                                            const P256ECDSASignature & signature) const override;
+    CHIP_ERROR ECDSA_validate_hash_signature(const uint8_t * hash, size_t hash_length,
+                                             const P256ECDSASignature & signature) const override;
+
+private:
+    uint8_t bytes[kP256_PublicKey_Length];
+};
+
+class HKDF_sha_SE05x : public HKDF_sha
+{
+public:
+    CHIP_ERROR HKDF_SHA256(const uint8_t * secret, size_t secret_length, const uint8_t * salt, size_t salt_length,
+                           const uint8_t * info, size_t info_length, uint8_t * out_buffer, size_t out_length) override;
+};
+
+class HMAC_sha_SE05x : public HMAC_sha
+{
+public:
+    virtual CHIP_ERROR HMAC_SHA256(const uint8_t * key, size_t key_length, const uint8_t * message, size_t message_length,
+                                   uint8_t * out_buffer, size_t out_length) override;
+
+    virtual CHIP_ERROR HMAC_SHA256(const Hmac128KeyHandle & key, const uint8_t * message, size_t message_length,
+                                   uint8_t * out_buffer, size_t out_length) override;
+};
+
+class PBKDF2_sha256_SE05x : public PBKDF2_sha256
+{
+public:
+    virtual CHIP_ERROR pbkdf2_sha256(const uint8_t * password, size_t plen, const uint8_t * salt, size_t slen,
+                                     unsigned int iteration_count, uint32_t key_length, uint8_t * output) override;
+};
+
 } // namespace Crypto
 } // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.cpp b/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.cpp
index bb6fe9c8b76..944fe9913f8 100644
--- a/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.cpp
+++ b/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.cpp
@@ -23,7 +23,9 @@ namespace chip {
 
 using namespace chip::Crypto;
 
-#define CHIP_SE05x_NODE_OP_KEY_INDEX 0x7E000000
+#define CHIP_SE05x_NODE_OP_KEY_INDEX (SE051H_NODE_OP_KEY_ID - 1)
+#define NUM_NODE_OP_KEY_INDEXES (5)
+
 #define CHIP_SE05x_NODE_OP_REF_KEY_TEMPLATE                                                                                        \
     {                                                                                                                              \
         0xA5, 0xA6, 0xB5, 0xB6, 0xA5, 0xA6, 0xB5, 0xB6, 0x7E, 0x00, 0x00, 0x00                                                     \
@@ -44,6 +46,7 @@ CHIP_ERROR PersistentStorageOpKeystorese05x::NewOpKeypairForFabric(FabricIndex f
 
     VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
     VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(se05x_session_open() == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
 
     // If a key is pending, we cannot generate for a different fabric index until we commit or revert.
     if ((mPendingFabricIndex != kUndefinedFabricIndex) && (fabricIndex != mPendingFabricIndex))
@@ -56,7 +59,7 @@ CHIP_ERROR PersistentStorageOpKeystorese05x::NewOpKeypairForFabric(FabricIndex f
     // Replace previous pending key pair, if any was previously allocated
     ResetPendingKey();
 
-    mPendingKeypair = Platform::New<Crypto::P256Keypair>();
+    mPendingKeypair = Platform::New<Crypto::P256KeypairSE05x>();
     VerifyOrReturnError(mPendingKeypair != nullptr, CHIP_ERROR_NO_MEMORY);
 
     hsmKeyId                                        = CHIP_SE05x_NODE_OP_KEY_INDEX + fabricIndex;
@@ -94,6 +97,7 @@ CHIP_ERROR PersistentStorageOpKeystorese05x::RemoveOpKeypairForFabric(FabricInde
 {
     VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
     VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(se05x_session_open() == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
 
     uint32_t keyId = CHIP_SE05x_NODE_OP_KEY_INDEX + fabricIndex;
 
@@ -117,4 +121,44 @@ CHIP_ERROR PersistentStorageOpKeystorese05x::RemoveOpKeypairForFabric(FabricInde
     return err;
 }
 
+CHIP_ERROR PersistentStorageOpKeystorese05x::SignWithOpKeypair(FabricIndex fabricIndex, const ByteSpan & message,
+                                                               Crypto::P256ECDSASignature & outSignature) const
+{
+    VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(se05x_session_open() == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
+
+    ChipLogDetail(Crypto, "PersistentStorageOpKeystorese05x::SignWithOpKeypair :: ECDSA Sign using SE05x ");
+
+    if (mIsPendingKeypairActive && (fabricIndex == mPendingFabricIndex))
+    {
+        VerifyOrReturnError(mPendingKeypair != nullptr, CHIP_ERROR_INTERNAL);
+        // We have an override key: sign with it!
+        return mPendingKeypair->ECDSA_sign_msg(message.data(), message.size(), outSignature);
+    }
+
+    // Use ExportOpKeypairForFabric from base class directly
+    auto transientOperationalKeypair = Platform::MakeUnique<P256KeypairSE05x>();
+    if (!transientOperationalKeypair)
+    {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    P256SerializedKeypair serializedOpKey;
+    // Call base class method directly using 'this'
+    CHIP_ERROR err = const_cast<PersistentStorageOpKeystorese05x *>(this)->ExportOpKeypairForFabric(fabricIndex, serializedOpKey);
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+    {
+        return CHIP_ERROR_INVALID_FABRIC_INDEX;
+    }
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Crypto, "Failed to export keypair for fabric %u: %" CHIP_ERROR_FORMAT, fabricIndex, err.Format());
+    }
+    ReturnErrorOnFailure(err);
+
+    ReturnErrorOnFailure(transientOperationalKeypair->Deserialize(serializedOpKey));
+    return transientOperationalKeypair->ECDSA_sign_msg(message.data(), message.size(), outSignature);
+}
+
 } // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.h b/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.h
index a03a45892e9..05a544bc27b 100644
--- a/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.h
+++ b/src/platform/nxp/crypto/se05x/PersistentStorageOperationalKeystore_se05x.h
@@ -36,6 +36,8 @@ class PersistentStorageOpKeystorese05x : public chip::PersistentStorageOperation
 public:
     CHIP_ERROR NewOpKeypairForFabric(FabricIndex fabricIndex, MutableByteSpan & outCertificateSigningRequest) override;
     CHIP_ERROR RemoveOpKeypairForFabric(FabricIndex fabricIndex) override;
+    CHIP_ERROR SignWithOpKeypair(FabricIndex fabricIndex, const ByteSpan & message,
+                                 Crypto::P256ECDSASignature & outSignature) const override;
 };
 
 } // namespace chip
diff --git a/src/platform/nxp/crypto/se05x/args.gni b/src/platform/nxp/crypto/se05x/args.gni
index f0f02a4d0aa..17c07187ff5 100644
--- a/src/platform/nxp/crypto/se05x/args.gni
+++ b/src/platform/nxp/crypto/se05x/args.gni
@@ -23,10 +23,8 @@ declare_args() {
   chip_se05x_spake_verifier = false
   chip_se05x_spake_prover = false
   chip_se05x_rnd_gen = false
-  chip_se05x_gen_ec_key = true
-  chip_se05x_ecdsa_verify = true
-  chip_se05x_pbkdf2_sha256 = false
-  chip_se05x_hkdf_sha256 = false
-  chip_se05x_hmac_sha256 = false
   chip_se05x_device_attestation = false
+  chip_se05x_spake_verifier_use_tp_values = false
+  chip_se05x_spake_verifier_tp_set_no = 1
+  chip_se05x_spake_verifier_tp_iter_cnt = 1000
 }
diff --git a/src/platform/nxp/mcxw72/BUILD.gn b/src/platform/nxp/mcxw72/BUILD.gn
index a76651e59d1..0b79134c702 100644
--- a/src/platform/nxp/mcxw72/BUILD.gn
+++ b/src/platform/nxp/mcxw72/BUILD.gn
@@ -109,6 +109,10 @@ static_library("nxp_platform") {
     ]
 
     include_dirs = [ "${nxp_sdk_build_root}/mbedtls/config" ]
+  } else if (chip_crypto == "psa") {
+    if (chip_crypto_spake2p == "custom") {
+      sources += [ "../common/crypto/SecLibSpake2p.cpp" ]
+    }
   }
 
   if (chip_enable_ble) {
diff --git a/src/platform/nxp/mcxw72/CHIPDevicePlatformConfig.h b/src/platform/nxp/mcxw72/CHIPDevicePlatformConfig.h
index 5630a948255..891a40fb8e6 100644
--- a/src/platform/nxp/mcxw72/CHIPDevicePlatformConfig.h
+++ b/src/platform/nxp/mcxw72/CHIPDevicePlatformConfig.h
@@ -37,12 +37,14 @@
 
 // ========== Platform-specific Configuration Overrides =========
 
-#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 0
 #define CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED 0
 #define CHIP_DEVICE_CONFIG_USE_ZEPHYR_BLE 0
 #define CHIP_DEVICE_CONFIG_PROCESS_BLE_IN_THREAD 1
 #define CHIP_DEVICE_CONFIG_INIT_OT_PLAT_ALARM 0
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (6 * 1024)
+#ifndef CONFIG_CHIP_TASK_STACK_SIZE
+/* In case of non-KCONFIG build, define the task stack size */
+#define CONFIG_CHIP_TASK_STACK_SIZE (6 * 1024)
+#endif
 #define CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE (3 * 1024)
 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25
 
diff --git a/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.cpp b/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.cpp
index 0f41d5277d3..0f9bcb39ed0 100644
--- a/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.cpp
+++ b/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.cpp
@@ -55,8 +55,6 @@ extern uint32_t __FACTORY_DATA_SIZE[];
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 CHIP_ERROR FactoryDataProviderImpl::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                                                 uint32_t * contentAddr)
 {
@@ -339,10 +337,13 @@ CHIP_ERROR FactoryDataProviderImpl::Hash256(const uint8_t * input, size_t inputS
     return CHIP_NO_ERROR;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.h b/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.h
index 0aca2e20dd7..e9224737274 100644
--- a/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.h
+++ b/src/platform/nxp/rt/rt1060/FactoryDataProviderImpl.h
@@ -49,8 +49,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                            uint32_t * contentAddr = NULL);
     ~FactoryDataProviderImpl(){};
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.cpp b/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.cpp
index ddfe2055c6c..7bfc5bc0965 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.cpp
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.cpp
@@ -63,8 +63,6 @@ using namespace ::chip::Crypto;
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 CHIP_ERROR FactoryDataProviderImpl::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                                                 uint32_t * contentAddr)
 {
@@ -260,10 +258,13 @@ CHIP_ERROR FactoryDataProviderImpl::Init(void)
     return CHIP_NO_ERROR;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.h b/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.h
index 05a59b35a36..5e832dcc433 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.h
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderEl2GoImpl.h
@@ -41,8 +41,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     ~FactoryDataProviderImpl(){};
 
     CHIP_ERROR Init(void) override;
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.cpp b/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.cpp
index 1feada54c5c..fceccf834cb 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.cpp
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.cpp
@@ -66,8 +66,6 @@ using namespace ::chip::Crypto;
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 static constexpr size_t kAesKeyBlobLength = Crypto::kP256_PrivateKey_Length + ELS_BLOB_METADATA_SIZE + ELS_WRAP_OVERHEAD;
 
 #define TAG_ID_FOR_AES_KEY_BOLB 0xFE
@@ -540,10 +538,13 @@ CHIP_ERROR FactoryDataProviderImpl::Validate()
     return CHIP_NO_ERROR;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.h b/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.h
index 9f81c904423..4da21b5ba0a 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.h
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderEncImpl.h
@@ -44,8 +44,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     FactoryDataProviderImpl();
     ~FactoryDataProviderImpl(){};
 
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.cpp b/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.cpp
index a29eda2afe4..4d56cf2654f 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.cpp
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.cpp
@@ -63,8 +63,6 @@ using namespace ::chip::Crypto;
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 static constexpr size_t kPrivateKeyBlobLength = Crypto::kP256_PrivateKey_Length + ELS_BLOB_METADATA_SIZE + ELS_WRAP_OVERHEAD;
 
 CHIP_ERROR FactoryDataProviderImpl::DecryptAesEcb(uint8_t * dest, uint8_t * source)
@@ -418,10 +416,13 @@ CHIP_ERROR FactoryDataProviderImpl::ReplaceWithBlob(uint8_t * data, uint8_t * bl
     return CHIP_NO_ERROR;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.h b/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.h
index e7754b1cf34..48adff4f708 100644
--- a/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.h
+++ b/src/platform/nxp/rt/rw61x/FactoryDataProviderImpl.h
@@ -37,8 +37,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                            uint32_t * contentAddr = NULL);
 
diff --git a/src/platform/nxp/zephyr/FactoryDataProviderImpl.cpp b/src/platform/nxp/zephyr/FactoryDataProviderImpl.cpp
index 6b1e347a284..74c420ee000 100644
--- a/src/platform/nxp/zephyr/FactoryDataProviderImpl.cpp
+++ b/src/platform/nxp/zephyr/FactoryDataProviderImpl.cpp
@@ -38,8 +38,6 @@
 namespace chip {
 namespace DeviceLayer {
 
-FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
-
 CHIP_ERROR FactoryDataProviderImpl::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                                                 uint32_t * contentAddr)
 {
@@ -222,10 +220,13 @@ CHIP_ERROR FactoryDataProviderImpl::ReadEncryptedData(uint8_t * dest, uint8_t *
     return CHIP_NO_ERROR;
 }
 
+#ifndef CONFIG_CHIP_FACTORY_DATA_PROVIDER_CUSTOM_SINGLETON_IMPL
 FactoryDataProvider & FactoryDataPrvdImpl()
 {
-    return FactoryDataProviderImpl::sInstance;
+    static FactoryDataProviderImpl sInstance;
+    return sInstance;
 }
+#endif
 
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/zephyr/FactoryDataProviderImpl.h b/src/platform/nxp/zephyr/FactoryDataProviderImpl.h
index 8ad3ffb2fc2..aac596b3db0 100644
--- a/src/platform/nxp/zephyr/FactoryDataProviderImpl.h
+++ b/src/platform/nxp/zephyr/FactoryDataProviderImpl.h
@@ -36,8 +36,6 @@ namespace DeviceLayer {
 class FactoryDataProviderImpl : public FactoryDataProvider
 {
 public:
-    static FactoryDataProviderImpl sInstance;
-
     CHIP_ERROR Init(void);
     CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
                            uint32_t * contentAddr = NULL);
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index eed485eb8b1..3cb488bb66c 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -352,18 +352,39 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)
 {
+    using app::Clusters::NetworkCommissioning::WiFiSecurityBitmap;
     using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum;
 
     wfx_wifi_scan_result_t ap = { 0 };
     CHIP_ERROR error          = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);
-    if (error == CHIP_NO_ERROR)
+    VerifyOrReturnError(error == CHIP_NO_ERROR, error);
+
+    // Map Matter WiFiSecurityBitmap to WiFiNetworkDiagnostics SecurityTypeEnum (prefer highest)
+    if (ap.security.Has(WiFiSecurityBitmap::kWpa3Personal))
     {
-        // TODO: Is this actually right?  Do the wfx_wifi_scan_result_t values
-        // match the Matter spec ones?
-        securityType = static_cast<SecurityTypeEnum>(ap.security);
-        return CHIP_NO_ERROR;
+        securityType = SecurityTypeEnum::kWpa3;
     }
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    else if (ap.security.Has(WiFiSecurityBitmap::kWpa2Personal))
+    {
+        securityType = SecurityTypeEnum::kWpa2;
+    }
+    else if (ap.security.Has(WiFiSecurityBitmap::kWpaPersonal))
+    {
+        securityType = SecurityTypeEnum::kWpa;
+    }
+    else if (ap.security.Has(WiFiSecurityBitmap::kWep))
+    {
+        securityType = SecurityTypeEnum::kWep;
+    }
+    else if (ap.security.Has(WiFiSecurityBitmap::kUnencrypted))
+    {
+        securityType = SecurityTypeEnum::kNone;
+    }
+    else
+    {
+        securityType = SecurityTypeEnum::kUnspecified;
+    }
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
index 4414306220f..33a594f923e 100644
--- a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
@@ -77,13 +77,15 @@ CHIP_ERROR SlWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
 
 CHIP_ERROR SlWiFiDriver::CommitConfiguration()
 {
-    uint8_t securityType = WFX_SEC_WPA2;
+    constexpr uint8_t kDefaultSecurityBitmap =
+        static_cast<uint8_t>(chip::app::Clusters::NetworkCommissioning::WiFiSecurityBitmap::kWpa2Personal);
 
     ReturnErrorOnFailure(
         SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
     ReturnErrorOnFailure(SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_WiFiPSK, mStagingNetwork.credentials,
                                                            mStagingNetwork.credentialsLen));
-    ReturnErrorOnFailure(SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_WiFiSEC, &securityType, sizeof(securityType)));
+    ReturnErrorOnFailure(SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_WiFiSEC, &kDefaultSecurityBitmap,
+                                                           sizeof(kDefaultSecurityBitmap)));
 
     mSavedNetwork = mStagingNetwork;
     return CHIP_NO_ERROR;
@@ -160,7 +162,7 @@ CHIP_ERROR SlWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     memcpy(wifiConfig.passkey, key, keyLen);
     wifiConfig.passkeyLength = keyLen;
 
-    wifiConfig.security = WFX_SEC_WPA2;
+    wifiConfig.security.Set(chip::app::Clusters::NetworkCommissioning::WiFiSecurityBitmap::kWpa2Personal);
 
     ChipLogProgress(NetworkProvisioning, "Setting up connection for WiFi SSID: %s", NullTerminated(ssid, ssidLen).c_str());
     // Resetting the retry connection state machine for a new access point connection
@@ -233,38 +235,6 @@ void SlWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-chip::BitFlags<WiFiSecurity> SlWiFiDriver::ConvertSecuritytype(wfx_sec_t security)
-{
-    chip::BitFlags<WiFiSecurity> securityType;
-    if (security == WFX_SEC_NONE)
-    {
-        securityType = WiFiSecurity::kUnencrypted;
-    }
-    else if (security == WFX_SEC_WEP)
-    {
-        securityType = WiFiSecurity::kWep;
-    }
-    else if (security == WFX_SEC_WPA)
-    {
-        securityType = WiFiSecurity::kWpaPersonal;
-    }
-    else if (security == WFX_SEC_WPA2)
-    {
-        securityType = WiFiSecurity::kWpa2Personal;
-    }
-    else if (security == WFX_SEC_WPA3)
-    {
-        securityType = WiFiSecurity::kWpa3Personal;
-    }
-    else
-    {
-        // wfx_sec_t support more type
-        securityType = WiFiSecurity::kUnencrypted;
-    }
-
-    return securityType;
-}
-
 uint32_t SlWiFiDriver::GetSupportedWiFiBandsMask() const
 {
     return WifiInterface::GetInstance().GetSupportedWiFiBandsMask();
@@ -315,7 +285,7 @@ void SlWiFiDriver::OnScanWiFiNetworkDone(wfx_wifi_scan_result_t * aScanResult)
     {
         NetworkCommissioning::WiFiScanResponse scanResponse = {};
 
-        scanResponse.security.Set(nwDriver->ConvertSecuritytype(aScanResult->security));
+        scanResponse.security        = aScanResult->security;
         scanResponse.channel         = aScanResult->chan;
         scanResponse.signal.type     = NetworkCommissioning::WirelessSignalType::kdBm;
         scanResponse.signal.strength = aScanResult->rssi;
diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.h b/src/platform/silabs/NetworkCommissioningWiFiDriver.h
index d4914df2462..de48dafdeea 100644
--- a/src/platform/silabs/NetworkCommissioningWiFiDriver.h
+++ b/src/platform/silabs/NetworkCommissioningWiFiDriver.h
@@ -122,7 +122,6 @@ class SlWiFiDriver final : public WiFiDriver
 
     CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
 
-    chip::BitFlags<WiFiSecurity> ConvertSecuritytype(wfx_sec_t security);
     uint32_t GetSupportedWiFiBandsMask() const override;
 
     void OnConnectWiFiNetwork();
diff --git a/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp b/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
index 450c040fb21..7ef4e91dc1b 100644
--- a/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
+++ b/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
@@ -74,7 +74,7 @@ extern "C" {
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 using namespace chip::DeviceLayer::Silabs;
-using WiFiBandEnum = chip::app::Clusters::NetworkCommissioning::WiFiBandEnum;
+using namespace chip::app::Clusters::NetworkCommissioning;
 
 // The REGION_CODE macro defines the regulatory region for the Wi-Fi device.
 // The default value is 'US'. Users can override this macro to specify a different region code.
@@ -204,30 +204,41 @@ constexpr uint8_t kWfxQueueSize = 10;
 // TODO: Figure out why we actually need this, we are already handling failure and retries somewhere else.
 constexpr uint16_t kWifiScanTimeoutTicks = 10000;
 
-// Convert sl_wifi_security_t to wfx_sec_t
-static wfx_sec_t ConvertSlWifiSecurityToWfx(sl_wifi_security_t security)
+// Convert sl_wifi_security_t to Matter WiFiSecurityBitmap flags
+static chip::BitFlags<WiFiSecurityBitmap> ConvertSlWifiSecurityToBitmap(const sl_wifi_security_t security)
 {
+    chip::BitFlags<WiFiSecurityBitmap> flags;
     switch (security)
     {
     case SL_WIFI_OPEN:
-        return WFX_SEC_NONE;
+        flags.Set(WiFiSecurityBitmap::kUnencrypted);
+        break;
     case SL_WIFI_WEP:
-        return WFX_SEC_WEP;
+        flags.Set(WiFiSecurityBitmap::kWep);
+        break;
     case SL_WIFI_WPA:
-    case SL_WIFI_WPA_ENTERPRISE: // map enterprise to WPA as closest
-        return WFX_SEC_WPA;
+    case SL_WIFI_WPA_ENTERPRISE:
+        flags.Set(WiFiSecurityBitmap::kWpaPersonal);
+        break;
     case SL_WIFI_WPA2:
-    case SL_WIFI_WPA2_ENTERPRISE: // map enterprise to WPA2 as closest
+    case SL_WIFI_WPA2_ENTERPRISE:
+        flags.Set(WiFiSecurityBitmap::kWpa2Personal);
+        break;
     case SL_WIFI_WPA_WPA2_MIXED:
-        return WFX_SEC_WPA2;
+        flags.Set(WiFiSecurityBitmap::kWpaPersonal).Set(WiFiSecurityBitmap::kWpa2Personal);
+        break;
     case SL_WIFI_WPA3_TRANSITION:
-    case SL_WIFI_WPA3_TRANSITION_ENTERPRISE: // map enterprise to WPA3 transition
+    case SL_WIFI_WPA3_TRANSITION_ENTERPRISE:
+        flags.Set(WiFiSecurityBitmap::kWpa2Personal).Set(WiFiSecurityBitmap::kWpa3Personal);
+        break;
     case SL_WIFI_WPA3:
     case SL_WIFI_WPA3_ENTERPRISE:
-        return WFX_SEC_WPA3; // map enterprise to WPA3
+        flags.Set(WiFiSecurityBitmap::kWpa3Personal);
+        break;
     default:
-        return WFX_SEC_UNSPECIFIED;
+        break;
     }
+    return flags;
 }
 
 /**
@@ -271,9 +282,8 @@ sl_status_t BackgroundScanCallback(sl_wifi_event_t event, sl_wifi_scan_result_t
         chip::MutableByteSpan outBssid(currentScanResult.bssid, kWifiMacAddressLength);
         ReturnValueOnFailure(chip::CopySpanToMutableSpan(inBssid, outBssid), SL_STATUS_SI91X_MEMORY_IS_NOT_SUFFICIENT);
 
-        // Convert sl_wifi_security_t to wfx_sec_t
         currentScanResult.security =
-            ConvertSlWifiSecurityToWfx(static_cast<sl_wifi_security_t>(result->scan_info[i].security_mode));
+            ConvertSlWifiSecurityToBitmap(static_cast<sl_wifi_security_t>(result->scan_info[i].security_mode));
         currentScanResult.rssi = (-1) * result->scan_info[i].rssi_val; // The returned value is positive - we need to flip it
         currentScanResult.chan = result->scan_info[i].rf_channel;
         // TODO: change this when SDK provides values
@@ -384,8 +394,9 @@ sl_status_t ScanCallback(sl_wifi_event_t event, sl_wifi_scan_result_t * scan_res
     }
     else
     {
-        security        = static_cast<sl_wifi_security_t>(scan_result->scan_info[0].security_mode);
-        wfx_rsi.ap_chan = scan_result->scan_info[0].rf_channel;
+        security                     = static_cast<sl_wifi_security_t>(scan_result->scan_info[0].security_mode);
+        wfx_rsi.ap_chan              = scan_result->scan_info[0].rf_channel;
+        wfx_rsi.credentials.security = ConvertSlWifiSecurityToBitmap(security);
 
         chip::MutableByteSpan bssidSpan(wfx_rsi.ap_bssid.data(), kWifiMacAddressLength);
         chip::ByteSpan inBssid(scan_result->scan_info[0].bssid, kWifiMacAddressLength);
@@ -774,23 +785,41 @@ sl_status_t WifiInterfaceImpl::JoinCallback(sl_wifi_event_t event, char * result
 CHIP_ERROR WifiInterfaceImpl::GetAccessPointInfo(wfx_wifi_scan_result_t & info)
 {
     // TODO: Convert this to a int8
-    int32_t rssi  = 0;
+    int32_t rssi = 0;
+
+    // TODO: sl_wifi_get_wireless_info API is being deprecated with WiseConnect v4.0.x, we need to use the new API
+    // sl_wifi_get_interface_info after upgrading to WiseConnect v4.0.x
+    sl_si91x_rsp_wireless_info_t wireless_info = { 0 };
+    if (sl_wifi_get_wireless_info(&wireless_info) == SL_STATUS_OK)
+    {
+        size_t ssid_len = strnlen(reinterpret_cast<const char *>(wireless_info.ssid), WFX_MAX_SSID_LENGTH);
+        VerifyOrReturnError(ssid_len <= WFX_MAX_SSID_LENGTH, CHIP_ERROR_INVALID_STRING_LENGTH);
+
+        // Update wfx_rsi with values from sl_wifi_get_wireless_info
+        wfx_rsi.ap_chan = static_cast<uint16_t>(wireless_info.channel_number & 0xFF);
+        chip::ByteSpan bssidSrc(wireless_info.bssid, kWifiMacAddressLength);
+        chip::MutableByteSpan bssidDst(wfx_rsi.ap_bssid.data(), kWifiMacAddressLength);
+        ReturnErrorOnFailure(chip::CopySpanToMutableSpan(bssidSrc, bssidDst));
+        chip::ByteSpan ssidSrc(wireless_info.ssid, ssid_len);
+        chip::MutableByteSpan ssidDst(wfx_rsi.credentials.ssid, WFX_MAX_SSID_LENGTH);
+        ReturnErrorOnFailure(chip::CopySpanToMutableSpan(ssidSrc, ssidDst));
+        wfx_rsi.credentials.ssidLength = static_cast<uint8_t>(ssid_len);
+        wfx_rsi.credentials.security   = ConvertSlWifiSecurityToBitmap(static_cast<sl_wifi_security_t>(wireless_info.sec_type));
+    }
+
     info.security = wfx_rsi.credentials.security;
     info.chan     = wfx_rsi.ap_chan;
-
     chip::MutableByteSpan output(info.ssid, WFX_MAX_SSID_LENGTH);
     chip::ByteSpan ssid(wfx_rsi.credentials.ssid, wfx_rsi.credentials.ssidLength);
-    TEMPORARY_RETURN_IGNORED chip::CopySpanToMutableSpan(ssid, output);
+    ReturnErrorOnFailure(chip::CopySpanToMutableSpan(ssid, output));
     info.ssid_length = output.size();
-
     chip::ByteSpan apBssidSpan(wfx_rsi.ap_bssid.data(), wfx_rsi.ap_bssid.size());
     chip::MutableByteSpan bssidSpan(info.bssid, kWifiMacAddressLength);
-    TEMPORARY_RETURN_IGNORED chip::CopySpanToMutableSpan(apBssidSpan, bssidSpan);
+    ReturnErrorOnFailure(chip::CopySpanToMutableSpan(apBssidSpan, bssidSpan));
 
     // TODO: add error processing
     sl_wifi_get_signal_strength(SL_WIFI_CLIENT_INTERFACE, &(rssi));
     info.rssi = rssi;
-
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/silabs/wifi/WifiInterface.h b/src/platform/silabs/wifi/WifiInterface.h
index 1a6aabce9fa..94458e55b23 100644
--- a/src/platform/silabs/wifi/WifiInterface.h
+++ b/src/platform/silabs/wifi/WifiInterface.h
@@ -18,6 +18,7 @@
 
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app/icd/server/ICDServerConfig.h>
+#include <platform/NetworkCommissioning.h>
 
 #include <array>
 #include <cmsis_os2.h>
@@ -55,23 +56,11 @@ constexpr size_t kWifiMacAddressLength = 6;
 #define WFX_MAX_SSID_LENGTH (32)
 #define MAX_JOIN_RETRIES_COUNT (5)
 
-/* Note that these are same as RSI_security */
-typedef enum
-{
-    WFX_SEC_UNSPECIFIED    = 0,
-    WFX_SEC_NONE           = 1,
-    WFX_SEC_WEP            = 2,
-    WFX_SEC_WPA            = 3,
-    WFX_SEC_WPA2           = 4,
-    WFX_SEC_WPA3           = 5,
-    WFX_SEC_WPA_WPA2_MIXED = 6,
-} wfx_sec_t;
-
 typedef struct wfx_wifi_scan_result
 {
     uint8_t ssid[WFX_MAX_SSID_LENGTH]; // excludes null-character
     size_t ssid_length;
-    wfx_sec_t security;
+    chip::BitFlags<chip::app::Clusters::NetworkCommissioning::WiFiSecurityBitmap> security;
     uint8_t bssid[kWifiMacAddressLength];
     uint8_t chan;
     int16_t rssi; /* I suspect this is in dBm - so signed */
@@ -159,7 +148,7 @@ class WifiInterface : public WifiStateProvider, public PowerSaveInterface
         size_t ssidLength                       = 0;
         uint8_t passkey[WFX_MAX_PASSKEY_LENGTH] = { 0 };
         size_t passkeyLength                    = 0;
-        wfx_sec_t security                      = WFX_SEC_UNSPECIFIED;
+        chip::BitFlags<chip::app::Clusters::NetworkCommissioning::WiFiSecurityBitmap> security;
 
         WifiCredentials & operator=(const WifiCredentials & other)
         {
@@ -180,7 +169,7 @@ class WifiInterface : public WifiStateProvider, public PowerSaveInterface
             ssidLength = 0;
             memset(passkey, 0, WFX_MAX_PASSKEY_LENGTH);
             passkeyLength = 0;
-            security      = WFX_SEC_UNSPECIFIED;
+            security.ClearAll();
         }
     };
 
diff --git a/src/platform/silabs/wifi/wf200/WifiInterfaceImpl.cpp b/src/platform/silabs/wifi/wf200/WifiInterfaceImpl.cpp
index 28d6bc80604..5729fdabc4c 100644
--- a/src/platform/silabs/wifi/wf200/WifiInterfaceImpl.cpp
+++ b/src/platform/silabs/wifi/wf200/WifiInterfaceImpl.cpp
@@ -43,7 +43,7 @@
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::DeviceLayer::Silabs;
-using WiFiBandEnum = chip::app::Clusters::NetworkCommissioning::WiFiBandEnum;
+using namespace ::chip::app::Clusters::NetworkCommissioning;
 
 // TODO: This is a workaround because we depend on the platform lib which depends on the platform implementation.
 //       As such we can't depend on the platform here as well
@@ -440,27 +440,27 @@ static void sl_wfx_scan_result_callback(sl_wfx_scan_result_ind_body_t * scan_res
     TEMPORARY_RETURN_IGNORED chip::CopySpanToMutableSpan(scannedSsid, outputSsid);
     ap->scan.ssid_length = outputSsid.size();
 
-    // Set Network Security - We start by WPA3 to set the most secure type
-    ap->scan.security = WFX_SEC_UNSPECIFIED;
+    // Set Network Security using Matter WiFiSecurityBitmap
+    ap->scan.security.ClearAll();
     if (scan_result->security_mode.wpa3)
     {
-        ap->scan.security = WFX_SEC_WPA3;
+        ap->scan.security.Set(WiFiSecurityBitmap::kWpa3Personal);
     }
-    else if (scan_result->security_mode.wpa2)
+    if (scan_result->security_mode.wpa2)
     {
-        ap->scan.security = WFX_SEC_WPA2;
+        ap->scan.security.Set(WiFiSecurityBitmap::kWpa2Personal);
     }
-    else if (scan_result->security_mode.wpa)
+    if (scan_result->security_mode.wpa)
     {
-        ap->scan.security = WFX_SEC_WPA;
+        ap->scan.security.Set(WiFiSecurityBitmap::kWpaPersonal);
     }
-    else if (scan_result->security_mode.wep)
+    if (scan_result->security_mode.wep)
     {
-        ap->scan.security = WFX_SEC_WEP;
+        ap->scan.security.Set(WiFiSecurityBitmap::kWep);
     }
-    else
+    if (!ap->scan.security.HasAny())
     {
-        ap->scan.security = WFX_SEC_NONE;
+        ap->scan.security.Set(WiFiSecurityBitmap::kUnencrypted);
     }
 
     ap->scan.chan = scan_result->channel;
@@ -718,7 +718,7 @@ CHIP_ERROR WifiInterfaceImpl::GetAccessPointInfo(wfx_wifi_scan_result_t & info)
     ChipLogDetail(DeviceLayer, "WIFI:SSID     : %s", ap_info.ssid);
     ChipLogDetail(DeviceLayer, "WIFI:BSSID    : %02x:%02x:%02x:%02x:%02x:%02x", ap_info.bssid[0], ap_info.bssid[1],
                   ap_info.bssid[2], ap_info.bssid[3], ap_info.bssid[4], ap_info.bssid[5]);
-    ChipLogDetail(DeviceLayer, "WIFI:security : %d", info.security);
+    ChipLogDetail(DeviceLayer, "WIFI:security : 0x%x", static_cast<unsigned>(info.security.Raw()));
     ChipLogDetail(DeviceLayer, "WIFI:channel  :  %d", info.chan);
     ChipLogDetail(DeviceLayer, "signal_strength: %ld", signal_strength);
 
@@ -798,23 +798,26 @@ CHIP_ERROR WifiInterfaceImpl::ConnectToAccessPoint(void)
                   "Time: %d, Number of prob: %d",
                   ACTIVE_CHANNEL_TIME, PASSIVE_CHANNEL_TIME, NUM_PROBE_REQUEST);
     (void) sl_wfx_set_scan_parameters(ACTIVE_CHANNEL_TIME, PASSIVE_CHANNEL_TIME, NUM_PROBE_REQUEST);
-    switch (wifi_provision.security)
+    const chip::BitFlags<WiFiSecurityBitmap> & sec = wifi_provision.security;
+    if (sec.Has(WiFiSecurityBitmap::kWpa3Personal))
     {
-    case WFX_SEC_WEP:
-        connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_WEP;
-        break;
-    case WFX_SEC_WPA:
-    case WFX_SEC_WPA2:
-        connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_WPA2_WPA1_PSK;
-        break;
-    case WFX_SEC_WPA3:
         connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_WPA3_SAE;
-        break;
-    case WFX_SEC_NONE:
+    }
+    else if (sec.HasAny(WiFiSecurityBitmap::kWpa2Personal, WiFiSecurityBitmap::kWpaPersonal))
+    {
+        connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_WPA2_WPA1_PSK;
+    }
+    else if (sec.Has(WiFiSecurityBitmap::kWep))
+    {
+        connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_WEP;
+    }
+    else if (sec.Has(WiFiSecurityBitmap::kUnencrypted))
+    {
         connect_security_mode = sl_wfx_security_mode_e::WFM_SECURITY_MODE_OPEN;
-        break;
-    default:
-        ChipLogError(DeviceLayer, "error: unknown security type.");
+    }
+    else
+    {
+        ChipLogError(DeviceLayer, "error: unknown or unsupported security type.");
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
@@ -874,10 +877,8 @@ void WifiInterfaceImpl::ConnectionEventCallback(sl_wfx_connect_ind_body_t connec
     case WFM_STATUS_SUCCESS: {
         ChipLogProgress(DeviceLayer, "STA-Connected");
 
-        ap_info.chan = connect_indication_body.channel;
-        chip::ByteSpan securitySpan(reinterpret_cast<const uint8_t *>(&wifi_provision.security), sizeof(wifi_provision.security));
-        chip::MutableByteSpan apSecurityMutableSpan(reinterpret_cast<uint8_t *>(&ap_info.security), sizeof(ap_info.security));
-        TEMPORARY_RETURN_IGNORED chip::CopySpanToMutableSpan(securitySpan, apSecurityMutableSpan);
+        ap_info.chan     = connect_indication_body.channel;
+        ap_info.security = wifi_provision.security;
 
         // Store SSID
         chip::ByteSpan apSsidSpan(wifi_provision.ssid, wifi_provision.ssidLength);
diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp
index 56c3c3add93..b13f1f7aaae 100644
--- a/src/platform/telink/BLEManagerImpl.cpp
+++ b/src/platform/telink/BLEManagerImpl.cpp
@@ -30,6 +30,7 @@
 #include <ble/Ble.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/SafeInt.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/internal/BLEManager.h>
@@ -281,18 +282,40 @@ inline CHIP_ERROR BLEManagerImpl::PrepareAdvertisingRequest(void)
     Encoding::LittleEndian::Put16(serviceData.uuid, UUID16_CHIPoBLEService.val);
     ReturnErrorOnFailure(ConfigurationMgr().GetBLEDeviceIdentificationInfo(serviceData.deviceIdInfo));
 
+#if CHIP_DEVICE_CONFIG_EXT_ADVERTISING
+    if (mFlags.Has(Flags::kExtendedAdvertisingEnabled))
+    {
+        serviceData.deviceIdInfo.SetVendorId(DEVICE_HANDLE_NULL);
+        serviceData.deviceIdInfo.SetProductId(DEVICE_HANDLE_NULL);
+        serviceData.deviceIdInfo.SetExtendedAnnouncementFlag(true);
+    }
+#endif
+
     advertisingData[0]  = BT_DATA(BT_DATA_FLAGS, &kAdvertisingFlags, sizeof(kAdvertisingFlags));
     advertisingData[1]  = BT_DATA(BT_DATA_SVC_DATA16, &serviceData, sizeof(serviceData));
     scanResponseData[0] = BT_DATA(BT_DATA_NAME_COMPLETE, name, nameSize);
 
-    mAdvertisingRequest.priority         = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY;
-    mAdvertisingRequest.options          = kAdvertisingOptions;
-    mAdvertisingRequest.minInterval      = mFlags.Has(Flags::kFastAdvertisingEnabled)
-             ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN
-             : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN;
-    mAdvertisingRequest.maxInterval      = mFlags.Has(Flags::kFastAdvertisingEnabled)
-             ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX
-             : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX;
+    mAdvertisingRequest.priority = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY;
+    mAdvertisingRequest.options  = kAdvertisingOptions;
+
+    if (mFlags.Has(Flags::kFastAdvertisingEnabled))
+    {
+        mAdvertisingRequest.minInterval = CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN;
+        mAdvertisingRequest.maxInterval = CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX;
+    }
+#if CHIP_DEVICE_CONFIG_EXT_ADVERTISING
+    else if (mFlags.Has(Flags::kExtendedAdvertisingEnabled))
+    {
+        mAdvertisingRequest.minInterval = CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN;
+        mAdvertisingRequest.maxInterval = CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX;
+    }
+#endif
+    else
+    {
+        mAdvertisingRequest.minInterval = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN;
+        mAdvertisingRequest.maxInterval = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX;
+    }
+
     mAdvertisingRequest.advertisingData  = Span<bt_data>(advertisingData);
     mAdvertisingRequest.scanResponseData = nameSize ? Span<bt_data>(scanResponseData) : Span<bt_data>{};
 
@@ -396,10 +419,17 @@ CHIP_ERROR BLEManagerImpl::StartAdvertisingProcess(void)
 
         if (mFlags.Has(Flags::kFastAdvertisingEnabled))
         {
-            // Start timer to change advertising interval.
+            // Start timer to change advertising interval from fast to slow.
             TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().StartTimer(
                 System::Clock::Milliseconds32(CHIP_DEVICE_CONFIG_BLE_ADVERTISING_INTERVAL_CHANGE_TIME),
-                HandleBLEAdvertisementIntervalChange, this);
+                HandleSlowBLEAdvertisementInterval, this);
+
+#if CHIP_DEVICE_CONFIG_EXT_ADVERTISING
+            // Start timer to schedule start of the extended advertising
+            TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().StartTimer(
+                System::Clock::Milliseconds32(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS),
+                HandleExtendedBLEAdvertisementInterval, this);
+#endif
         }
     }
 
@@ -425,6 +455,10 @@ CHIP_ERROR BLEManagerImpl::StopAdvertising(void)
         mFlags.Clear(Flags::kAdvertising);
         mFlags.Set(Flags::kFastAdvertisingEnabled, true);
 
+#if CHIP_DEVICE_CONFIG_EXT_ADVERTISING
+        mFlags.Clear(Flags::kExtendedAdvertisingEnabled);
+#endif
+
         ChipLogProgress(DeviceLayer, "CHIPoBLE advertising stopped");
 
         // Post a CHIPoBLEAdvertisingChange(Stopped) event.
@@ -436,7 +470,8 @@ CHIP_ERROR BLEManagerImpl::StopAdvertising(void)
         }
 
         // Cancel timer event changing CHIPoBLE advertisement interval
-        DeviceLayer::SystemLayer().CancelTimer(HandleBLEAdvertisementIntervalChange, this);
+        DeviceLayer::SystemLayer().CancelTimer(HandleSlowBLEAdvertisementInterval, this);
+        DeviceLayer::SystemLayer().CancelTimer(HandleExtendedBLEAdvertisementInterval, this);
     }
 
     return CHIP_NO_ERROR;
@@ -449,6 +484,9 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
         ChipLogDetail(DeviceLayer, "CHIPoBLE advertising set to %s", val ? "on" : "off");
 
         mFlags.Set(Flags::kAdvertisingEnabled, val);
+        // Ensure that each enabling/disabling of the general advertising clears
+        // the extended mode, to make sure we always start fresh in the regular mode
+        mFlags.Set(Flags::kExtendedAdvertisingEnabled, false);
         TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DriveBLEState, 0);
     }
 
@@ -461,8 +499,14 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
     {
     case BLEAdvertisingMode::kFastAdvertising:
         mFlags.Set(Flags::kFastAdvertisingEnabled, true);
+        mFlags.Set(Flags::kExtendedAdvertisingEnabled, false);
         break;
     case BLEAdvertisingMode::kSlowAdvertising:
+        mFlags.Set(Flags::kFastAdvertisingEnabled, false);
+        mFlags.Set(Flags::kExtendedAdvertisingEnabled, false);
+        break;
+    case BLEAdvertisingMode::kExtendedAdvertising:
+        mFlags.Set(Flags::kExtendedAdvertisingEnabled, true);
         mFlags.Set(Flags::kFastAdvertisingEnabled, false);
         break;
     default:
@@ -657,12 +701,18 @@ CHIP_ERROR BLEManagerImpl::PrepareC3CharData(void)
 }
 #endif
 
-void BLEManagerImpl::HandleBLEAdvertisementIntervalChange(System::Layer * layer, void * param)
+void BLEManagerImpl::HandleSlowBLEAdvertisementInterval(System::Layer * layer, void * param)
 {
     TEMPORARY_RETURN_IGNORED BLEMgr().SetAdvertisingMode(BLEAdvertisingMode::kSlowAdvertising);
     ChipLogProgress(DeviceLayer, "CHIPoBLE advertising mode changed to slow");
 }
 
+void BLEManagerImpl::HandleExtendedBLEAdvertisementInterval(System::Layer * layer, void * param)
+{
+    TEMPORARY_RETURN_IGNORED BLEMgr().SetAdvertisingMode(BLEAdvertisingMode::kExtendedAdvertising);
+    ChipLogProgress(DeviceLayer, "CHIPoBLE advertising mode changed to extended");
+}
+
 void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -762,7 +812,8 @@ CHIP_ERROR BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const Chi
     params->attr = &sChipoBleAttributes[kCHIPoBLE_CCC_AttributeIndex];
     params->func = HandleTXIndicated;
     params->data = pBuf->Start();
-    params->len  = pBuf->DataLength();
+    VerifyOrExit(CanCastTo<uint16_t>(pBuf->DataLength()), err = CHIP_ERROR_MESSAGE_TOO_LONG);
+    params->len = static_cast<uint16_t>(pBuf->DataLength());
 
     status = bt_gatt_indicate(conId, params);
     VerifyOrExit(status == 0, err = MapErrorZephyr(status));
@@ -921,8 +972,10 @@ ssize_t BLEManagerImpl::HandleC3Read(struct bt_conn * conId, const struct bt_gat
         return 0;
     }
 
+    // For BLE, the max payload size is limited to UINT16_MAX since the length
+    // field is 2 bytes long. So, the cast to uint16_t should be fine.
     return bt_gatt_attr_read(conId, attr, buf, len, offset, sInstance.c3CharDataBufferHandle->Start(),
-                             sInstance.c3CharDataBufferHandle->DataLength());
+                             static_cast<uint16_t>(sInstance.c3CharDataBufferHandle->DataLength()));
 }
 #endif
 
diff --git a/src/platform/telink/BLEManagerImpl.h b/src/platform/telink/BLEManagerImpl.h
index dff0874fac1..5e9ae6ea577 100644
--- a/src/platform/telink/BLEManagerImpl.h
+++ b/src/platform/telink/BLEManagerImpl.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022-2024 Project CHIP Authors
+ *    Copyright (c) 2022-2026 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.
@@ -92,6 +92,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
         kAdvertisingRefreshNeeded =
             0x0010, /**< The advertising state/configuration has changed, but the SoftDevice has yet to be updated. */
         kChipoBleGattServiceRegister = 0x0020, /**< The system has currently CHIPoBLE GATT service registered. */
+        kExtendedAdvertisingEnabled  = 0x0040, /**< The application has enabled extended advertising. */
     };
 
     struct ServiceData;
@@ -150,7 +151,8 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
     static void HandleTXIndicated(bt_conn * conn, bt_gatt_indicate_params * attr, uint8_t err);
     static void HandleConnect(bt_conn * conn, uint8_t err);
     static void HandleDisconnect(bt_conn * conn, uint8_t reason);
-    static void HandleBLEAdvertisementIntervalChange(System::Layer * layer, void * param);
+    static void HandleSlowBLEAdvertisementInterval(System::Layer * layer, void * param);
+    static void HandleExtendedBLEAdvertisementInterval(System::Layer * layer, void * param);
 
     // ===== Members for internal use by the following friends.
 
diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h
index 8229b781a22..c5422f1a986 100644
--- a/src/platform/telink/CHIPDevicePlatformConfig.h
+++ b/src/platform/telink/CHIPDevicePlatformConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022-2024 Project CHIP Authors
+ *    Copyright (c) 2022-2026 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.
@@ -250,6 +250,12 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
 #endif // CONFIG_CHIP_EXTENDED_DISCOVERY
 
+#ifdef CONFIG_CHIP_BLE_EXT_ADVERTISING
+#define CHIP_DEVICE_CONFIG_EXT_ADVERTISING 1
+#endif // CONFIG_CHIP_BLE_EXT_ADVERTISING
+
+#define CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS (CONFIG_CHIP_BLE_ADVERTISING_DURATION * 60)
+
 #ifndef CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL
 #ifdef CONFIG_CHIP_ICD_SLOW_POLL_INTERVAL
 #define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL chip::System::Clock::Milliseconds32(CONFIG_CHIP_ICD_SLOW_POLL_INTERVAL)
diff --git a/src/platform/telink/OTAImageProcessorImpl.cpp b/src/platform/telink/OTAImageProcessorImpl.cpp
index 9f6d0270720..919eaee2f37 100644
--- a/src/platform/telink/OTAImageProcessorImpl.cpp
+++ b/src/platform/telink/OTAImageProcessorImpl.cpp
@@ -24,6 +24,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/KeyValueStoreManager.h>
+#include <system/SystemError.h>
 
 #include <zephyr/dfu/mcuboot.h>
 #include <zephyr/storage/flash_map.h>
@@ -215,10 +216,10 @@ CHIP_ERROR OTAImageProcessorImpl::RestoreBytes(ByteSpan & aBlock)
         // Align to the nearest lower multiple of sector size (4 KB) for Flash erase/write
         downloadedBytesRestored = ROUND_DOWN(downloadedBytesRestored, 0x1000);
         ChipLogDetail(SoftwareUpdate, "Restored %u/%u bytes", static_cast<unsigned>(downloadedBytesRestored),
-                      static_cast<unsigned>(mParams.totalFileBytes))
+                      static_cast<unsigned>(mParams.totalFileBytes));
 
-            // Reinit Flash Stream with offset
-            ReturnErrorOnFailure(System::MapErrorZephyr(stream_flash_buffered_write(&stream, NULL, 0, true)));
+        // Reinit Flash Stream with offset
+        ReturnErrorOnFailure(System::MapErrorZephyr(stream_flash_buffered_write(&stream, NULL, 0, true)));
         ReturnErrorOnFailure(InitFlashStream(downloadedBytesRestored));
     }
     else
diff --git a/src/platform/telink/tl3218x_2m_flash_lzma.overlay b/src/platform/telink/tl3218x_2m_flash_lzma.overlay
new file mode 100644
index 00000000000..dbb22507b04
--- /dev/null
+++ b/src/platform/telink/tl3218x_2m_flash_lzma.overlay
@@ -0,0 +1,39 @@
+&flash {
+	reg = <0x20000000 0x200000>;
+
+	/delete-node/ partitions;
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0xf000>;
+		};
+		slot0_partition: partition@f000 {
+			label = "image-0";
+			reg = <0xf000 0x139000>;
+		};
+		factory_partition: partition@148000 {
+			label = "factory-data";
+			reg = <0x148000 0x800>;
+		};
+		factory_rfu_partition: partition@148800 {
+			label = "factory-data-rfu";
+			reg = <0x148800 0x800>;
+		};
+		storage_partition: partition@149000 {
+			label = "storage";
+			reg = <0x149000 0xc000>;
+		};
+		slot1_partition: partition@155000 {
+			label = "image-1";
+			reg = <0x155000 0xa9000>;
+		};
+		vendor_partition: partition@1fe000 {
+			label = "vendor-data";
+			reg = <0x1fe000 0x2000>;
+		};
+	};
+};
diff --git a/src/platform/telink/tlsr9518adk80d_1m_flash.overlay b/src/platform/telink/tl7218x_2m_flash_lzma.overlay
similarity index 51%
rename from src/platform/telink/tlsr9518adk80d_1m_flash.overlay
rename to src/platform/telink/tl7218x_2m_flash_lzma.overlay
index 1a49a150cf3..922d7b63272 100644
--- a/src/platform/telink/tlsr9518adk80d_1m_flash.overlay
+++ b/src/platform/telink/tl7218x_2m_flash_lzma.overlay
@@ -1,5 +1,5 @@
 &flash {
-	reg = <0x20000000 0x100000>;
+	reg = <0x20000000 0x200000>;
 
 	/delete-node/ partitions;
 	partitions {
@@ -13,19 +13,23 @@
 		};
 		slot0_partition: partition@f000 {
 			label = "image-0";
-			reg = <0xf000 0xe3000>;
+			reg = <0xf000 0x139000>;
 		};
-		factory_partition: partition@f2000 {
+		factory_partition: partition@148000 {
 			label = "factory-data";
-			reg = <0xf2000 0x1000>;
+			reg = <0x148000 0x1000>;
 		};
-		storage_partition: partition@f3000 {
+		storage_partition: partition@149000 {
 			label = "storage";
-			reg = <0xf3000 0xb000>;
+			reg = <0x149000 0xc000>;
 		};
-		vendor_partition: partition@fe000 {
+		slot1_partition: partition@155000 {
+			label = "image-1";
+			reg = <0x155000 0xa9000>;
+		};
+		vendor_partition: partition@1fe000 {
 			label = "vendor-data";
-			reg = <0xfe000 0x2000>;
+			reg = <0x1fe000 0x2000>;
 		};
 	};
 };
diff --git a/src/platform/telink/tlsr9518adk80d_2m_flash_lzma.overlay b/src/platform/telink/tlsr9518adk80d_2m_flash_lzma.overlay
new file mode 100644
index 00000000000..922d7b63272
--- /dev/null
+++ b/src/platform/telink/tlsr9518adk80d_2m_flash_lzma.overlay
@@ -0,0 +1,35 @@
+&flash {
+	reg = <0x20000000 0x200000>;
+
+	/delete-node/ partitions;
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0xf000>;
+		};
+		slot0_partition: partition@f000 {
+			label = "image-0";
+			reg = <0xf000 0x139000>;
+		};
+		factory_partition: partition@148000 {
+			label = "factory-data";
+			reg = <0x148000 0x1000>;
+		};
+		storage_partition: partition@149000 {
+			label = "storage";
+			reg = <0x149000 0xc000>;
+		};
+		slot1_partition: partition@155000 {
+			label = "image-1";
+			reg = <0x155000 0xa9000>;
+		};
+		vendor_partition: partition@1fe000 {
+			label = "vendor-data";
+			reg = <0x1fe000 0x2000>;
+		};
+	};
+};
diff --git a/src/platform/telink/tlsr9528a_2m_flash_lzma.overlay b/src/platform/telink/tlsr9528a_2m_flash_lzma.overlay
new file mode 100644
index 00000000000..922d7b63272
--- /dev/null
+++ b/src/platform/telink/tlsr9528a_2m_flash_lzma.overlay
@@ -0,0 +1,35 @@
+&flash {
+	reg = <0x20000000 0x200000>;
+
+	/delete-node/ partitions;
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0xf000>;
+		};
+		slot0_partition: partition@f000 {
+			label = "image-0";
+			reg = <0xf000 0x139000>;
+		};
+		factory_partition: partition@148000 {
+			label = "factory-data";
+			reg = <0x148000 0x1000>;
+		};
+		storage_partition: partition@149000 {
+			label = "storage";
+			reg = <0x149000 0xc000>;
+		};
+		slot1_partition: partition@155000 {
+			label = "image-1";
+			reg = <0x155000 0xa9000>;
+		};
+		vendor_partition: partition@1fe000 {
+			label = "vendor-data";
+			reg = <0x1fe000 0x2000>;
+		};
+	};
+};
diff --git a/src/protocols/secure_channel/PASESession.h b/src/protocols/secure_channel/PASESession.h
index d2db297296a..6f56f456175 100644
--- a/src/protocols/secure_channel/PASESession.h
+++ b/src/protocols/secure_channel/PASESession.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <crypto/CHIPCryptoPAL.h>
-#if CHIP_CRYPTO_PSA_SPAKE2P
+#if CHIP_CRYPTO_SPAKE2P_PSA
 #include <crypto/PSASpake2p.h>
 #endif
 #include <lib/support/Base64.h>
@@ -215,7 +215,7 @@ class DLL_EXPORT PASESession : public Messaging::UnsolicitedMessageHandler,
     // mNextExpectedMsg is set when we are expecting a message.
     Optional<Protocols::SecureChannel::MsgType> mNextExpectedMsg;
 
-#if CHIP_CRYPTO_PSA_SPAKE2P
+#if CHIP_CRYPTO_SPAKE2P_PSA
     Crypto::PSASpake2p_P256_SHA256_HKDF_HMAC mSpake2p;
 #else
     Crypto::Spake2p_P256_SHA256_HKDF_HMAC mSpake2p;
diff --git a/src/python_testing/TC_BINFO_3_1.py b/src/python_testing/TC_BINFO_3_1.py
index d945c070b7d..9bc153d9767 100644
--- a/src/python_testing/TC_BINFO_3_1.py
+++ b/src/python_testing/TC_BINFO_3_1.py
@@ -45,7 +45,7 @@ def steps_TC_BINFO_3_1(self) -> list[TestStep]:
         return self.steps()
 
     def pics_TC_BINFO_3_1(self) -> list[str]:
-        return self.steps('BINFO')
+        return self.pics('BINFO')
 
     @run_if_endpoint_matches(has_attribute(Clusters.BasicInformation.Attributes.ProductAppearance))
     async def test_TC_BINFO_3_1(self):
diff --git a/src/python_testing/TC_BOOLCFG_6_1.py b/src/python_testing/TC_BOOLCFG_6_1.py
new file mode 100644
index 00000000000..dd22cd5d4e6
--- /dev/null
+++ b/src/python_testing/TC_BOOLCFG_6_1.py
@@ -0,0 +1,233 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_CLUSTERS_APP}
+#     app-args: >
+#       --discriminator 1234
+#       --KVS kvs1
+#       --trace-to json:${TRACE_APP}.json
+#       --app-pipe /tmp/boolcfg_6_1_fifo
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 1234
+#       --passcode 20202021
+#       --PICS src/app/tests/suites/certification/ci-pics-values
+#       --app-pipe /tmp/boolcfg_6_1_fifo
+#       --endpoint 1
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+
+from mobly import asserts
+
+import matter.clusters as Clusters
+from matter.testing.decorators import has_cluster, run_if_endpoint_matches
+from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler, EventSubscriptionHandler
+from matter.testing.matter_testing import MatterBaseTest, TestStep
+from matter.testing.runner import default_matter_test_main
+
+logger = logging.getLogger(__name__)
+
+
+class TC_BOOLCFG_6_1(MatterBaseTest):
+
+    def desc_TC_BOOLCFG_6_1(self) -> str:
+        return "[TC-BOOLCFG-6.1] Sensor fault functionality with DUT as Server"
+
+    def steps_TC_BOOLCFG_6_1(self) -> list[TestStep]:
+        return [
+            TestStep("1", "Commission DUT to TH", is_commissioning=True),
+            TestStep("2a", "TH reads FeatureMap attribute.", "DUT replies with FeatureMap attribute."),
+            TestStep("2b", "TH reads AttributeList attribute.", "DUT replies with AttributeList attribute."),
+            TestStep("3", "If FAULTEV feature is not supported, "
+                     "skip remaining steps and end test case."),
+            TestStep("4", "Set up a wildcard subscription for attributes and events of the Boolean State Configuration Cluster, "
+                     "with MinIntervalFloor set to 0, MaxIntervalCeiling set to 30 and KeepSubscriptions set to false.",
+                     "Subscription successfully established."),
+            TestStep("5", "Start accumulating all attribute and event reports on the subscription."),
+            TestStep("6", "Prompt operator to cause a sensor fault to be reported on the endpoint under test."),
+            TestStep("7", "If SensorFault attribute is supported, TH reads SensorFault attribute.",
+                     "DUT responds success and the received value is not equal to 0."),
+            TestStep("8", "Wait for up to 30 seconds for TH to have received an event data report.",
+                     "An event report has been received from DUT within 30 seconds for the SensorFault event "
+                     "and the received report contains a value for SensorFault not equal to 0."),
+            TestStep("9", "If SensorFault attribute is supported, TH waits to receive an attribute data report for up to 30 seconds.",
+                     "An attribute report has been received from DUT within 30 seconds for the SensorFault attribute "
+                     "and the received report contains a value not equal to 0."),
+            TestStep("10", "Prompt operator to clear the sensor fault reported on the endpoint under test."),
+            TestStep("11", "If SensorFault attribute is supported, TH reads SensorFault attribute.",
+                     "DUT responds success and the received value is equal to 0."),
+            TestStep("12", "Wait for up to 30 seconds for TH to have received an event data report.",
+                     "An event report has been received from DUT within 30 seconds for the SensorFault event "
+                     "and the received report contains a value for SensorFault equal to 0."),
+            TestStep("13", "If SensorFault attribute is supported, TH waits to receive an attribute data report for up to 30 seconds.",
+                     "An attribute report has been received from DUT within 30 seconds for the SensorFault attribute "
+                     "and the received report contains a value equal to 0."),
+        ]
+
+    def pics_TC_BOOLCFG_6_1(self) -> list[str]:
+        return [
+            "BOOLCFG.S",
+        ]
+
+    async def _trigger_sensor_fault(self, endpoint: int, fault_value: int) -> None:
+        logger.info("Setting SensorFault to 0x%04x on endpoint %d", fault_value, endpoint)
+        if self.is_pics_sdk_ci_only:
+            self.write_to_app_pipe({"Name": "SetBooleanStateSensorFault", "EndpointId": endpoint, "SensorFault": fault_value})
+        else:
+            if fault_value != 0:
+                result = self.wait_for_user_input(
+                    prompt_msg="Cause a sensor fault to be reported on the endpoint under test "
+                               "as instructed by the DUT's manufacturer. Were you able to cause a sensor fault?",
+                    prompt_msg_placeholder="Enter 'y' or 'n'",
+                    default_value="n")
+                asserts.assert_equal(result.lower(), "y", "Operator was not able to cause a sensor fault")
+            else:
+                result = self.wait_for_user_input(
+                    prompt_msg="Clear the sensor fault reported on the endpoint under test "
+                               "as instructed by the DUT's manufacturer. Were you able to clear the sensor fault?",
+                    prompt_msg_placeholder="Enter 'y' or 'n'",
+                    default_value="n")
+                asserts.assert_equal(result.lower(), "y", "Operator was not able to clear the sensor fault")
+
+    @run_if_endpoint_matches(has_cluster(Clusters.BooleanStateConfiguration))
+    async def test_TC_BOOLCFG_6_1(self) -> None:
+        cluster = Clusters.BooleanStateConfiguration
+        attributes = cluster.Attributes
+        endpoint = self.get_endpoint()
+        node_id = self.dut_node_id
+        dev_ctrl = self.default_controller
+
+        # Step 1: Commissioning
+        self.step("1")
+
+        # Step 2a: Read FeatureMap
+        self.step("2a")
+        feature_map = await self.read_single_attribute_check_success(
+            dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+            cluster=cluster, attribute=attributes.FeatureMap)
+        logger.info("FeatureMap: 0x%08x", feature_map)
+
+        is_fault_events_supported = feature_map & cluster.Bitmaps.Feature.kFaultEvents
+
+        # Step 2b: Read AttributeList
+        self.step("2b")
+        attribute_list = await self.read_single_attribute_check_success(
+            dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+            cluster=cluster, attribute=attributes.AttributeList)
+        logger.info("AttributeList: %s", attribute_list)
+
+        # Step 3: Guard - skip if FAULTEV not supported
+        self.step("3")
+        if not is_fault_events_supported:
+            logger.info("FAULTEV feature not supported, skipping remaining steps")
+            self.mark_all_remaining_steps_skipped("4")
+            return
+
+        # Step 4: Set up subscription
+        self.step("4")
+        attr_cb = None
+        if await self.attribute_guard(endpoint=endpoint, attribute=attributes.SensorFault):
+            attr_cb = AttributeSubscriptionHandler(expected_cluster=cluster, expected_attribute=attributes.SensorFault)
+            await attr_cb.start(
+                dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+                min_interval_sec=0, max_interval_sec=30, keepSubscriptions=False)
+
+        event_cb = EventSubscriptionHandler(expected_cluster=cluster)
+        await event_cb.start(
+            dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+            min_interval_sec=0, max_interval_sec=30)
+
+        # Step 5: Start accumulating reports - flush any priming reports received during subscription setup
+        self.step("5")
+        if attr_cb is not None:
+            attr_cb.reset()
+        event_cb.reset()
+
+        # Step 6: Trigger sensor fault
+        self.step("6")
+        await self._trigger_sensor_fault(endpoint, fault_value=1)
+
+        # Step 7: Read SensorFault attribute - should be non-zero
+        self.step("7")
+        if await self.attribute_guard(endpoint=endpoint, attribute=attributes.SensorFault):
+            sensor_fault = await self.read_single_attribute_check_success(
+                dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+                cluster=cluster, attribute=attributes.SensorFault)
+            logger.info("SensorFault attribute: 0x%04x", sensor_fault)
+            asserts.assert_not_equal(sensor_fault, 0, "SensorFault should not be 0 after triggering fault")
+
+        # Step 8: Wait for SensorFault event report with non-zero value
+        self.step("8")
+        event_data = event_cb.wait_for_event_type_report(cluster.Events.SensorFault, timeout_sec=30)
+        logger.info("Received SensorFault event: sensorFault=0x%04x", event_data.sensorFault)
+        asserts.assert_not_equal(event_data.sensorFault, 0,
+                                 "SensorFault event should contain a non-zero sensorFault value")
+
+        # Step 9: Wait for SensorFault attribute report with non-zero value
+        self.step("9")
+        if await self.attribute_guard(endpoint=endpoint, attribute=attributes.SensorFault):
+            item = attr_cb.wait_for_attribute_report(timeout_sec=30)
+            logger.info("Received SensorFault attribute report: 0x%04x", item.value)
+            asserts.assert_not_equal(item.value, 0, "SensorFault attribute report should be non-zero")
+
+        # Reset accumulated reports before clearing the fault
+        if attr_cb is not None:
+            attr_cb.reset()
+        event_cb.reset()
+
+        # Step 10: Clear sensor fault
+        self.step("10")
+        await self._trigger_sensor_fault(endpoint, fault_value=0)
+
+        # Step 11: Read SensorFault attribute - should be 0
+        self.step("11")
+        if await self.attribute_guard(endpoint=endpoint, attribute=attributes.SensorFault):
+            sensor_fault = await self.read_single_attribute_check_success(
+                dev_ctrl=dev_ctrl, node_id=node_id, endpoint=endpoint,
+                cluster=cluster, attribute=attributes.SensorFault)
+            logger.info("SensorFault attribute: 0x%04x", sensor_fault)
+            asserts.assert_equal(sensor_fault, 0, "SensorFault should be 0 after clearing fault")
+
+        # Step 12: Wait for SensorFault event report with zero value
+        self.step("12")
+        event_data = event_cb.wait_for_event_type_report(cluster.Events.SensorFault, timeout_sec=30)
+        logger.info("Received SensorFault event: sensorFault=0x%04x", event_data.sensorFault)
+        asserts.assert_equal(event_data.sensorFault, 0,
+                             "SensorFault event should contain a zero sensorFault value after clearing")
+
+        # Step 13: Wait for SensorFault attribute report with zero value
+        self.step("13")
+        if await self.attribute_guard(endpoint=endpoint, attribute=attributes.SensorFault):
+            item = attr_cb.wait_for_attribute_report(timeout_sec=30)
+            logger.info("Received SensorFault attribute report: 0x%04x", item.value)
+            asserts.assert_equal(item.value, 0, "SensorFault attribute report should be zero")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_BRBINFO_3_1.py b/src/python_testing/TC_BRBINFO_3_1.py
index 8d71c6819b3..1954ba9aa27 100644
--- a/src/python_testing/TC_BRBINFO_3_1.py
+++ b/src/python_testing/TC_BRBINFO_3_1.py
@@ -31,7 +31,7 @@ def steps_TC_BRBINFO_3_1(self) -> list[TestStep]:
         return self.steps()
 
     def pics_TC_BRBINFO_3_1(self) -> list[str]:
-        return self.steps('BRBINFO')
+        return self.pics('BRBINFO')
 
     @run_if_endpoint_matches(has_attribute(Clusters.BridgedDeviceBasicInformation.Attributes.ProductAppearance))
     async def test_TC_BRBINFO_3_1(self):
diff --git a/src/python_testing/TestRevokeCommissioningClearsPASE.py b/src/python_testing/TC_CADMIN_1_10.py
similarity index 67%
rename from src/python_testing/TestRevokeCommissioningClearsPASE.py
rename to src/python_testing/TC_CADMIN_1_10.py
index f7ba74f5a73..25e8cd6c32b 100644
--- a/src/python_testing/TestRevokeCommissioningClearsPASE.py
+++ b/src/python_testing/TC_CADMIN_1_10.py
@@ -37,25 +37,42 @@
 
 
 from mobly import asserts
+from support_modules.cadmin_support import CADMINBaseTest
 
 import matter.clusters as Clusters
 from matter.exceptions import ChipStackError
 from matter.testing.decorators import async_test_body
-from matter.testing.matter_testing import MatterBaseTest
-from matter.testing.runner import default_matter_test_main
-
-
-class TestRevokeCommissioningClearsPASE(MatterBaseTest):
+from matter.testing.runner import TestStep, default_matter_test_main
+
+
+class TC_CADMIN_1_10(CADMINBaseTest):
+
+    def steps_TC_CADMIN_1_10(self) -> list[TestStep]:
+        return [
+            TestStep("precondition", "Commissioning, already done", is_commissioning=True),
+            TestStep(1, "TH1 sends an OpenCommissioningWindow command, to allow TH2 to establish a PASE session with the DUT"),
+            TestStep(2, "TH2 establishes a PASE session with DUT"),
+            TestStep(3, "Read VendorName from BasicInformation Cluster using TH2 over PASE, to ensure PASE session is established",
+                     "Verify that the read is successful, and VendorName is present in the response"),
+            TestStep(4, "TH1 Sends RevokeCommissioning command (over CASE) to clear PASE session on DUT"),
+            TestStep(5, "Ensure that the PASE Session got cleared, by attempting to read VendorName using TH2 (over PASE)",
+                     "Verify that attempting to read VendorName attribute over PASE results in a timeout error"),
+            TestStep(6, "recreate Second Controller; to establish a new PASE session and repeat test, but sending RevokeCommissioning over PASE this time"),
+            TestStep(7, "TH1 sends an OpenCommissioningWindow command to DUT, to allow TH2 to establish a PASE session with the DUT"),
+            TestStep(8, "TH2 establishes a PASE session with DUT"),
+            TestStep(9, "TH2 Sends RevokeCommissioning command (Over PASE) to clear PASE session on DUT"),
+            TestStep(10, "Ensure that the PASE Session got cleared, by attempting to read VendorName using TH2 (over PASE)",
+                     "Verify that attempting to read VendorName attribute over PASE results in a timeout error"),
+        ]
+
+    def pics_TC_CADMIN_1_10(self) -> list[str]:
+        return ["CADMIN.S"]
 
     @async_test_body
-    async def test_TestRevokeCommissioningClearsPASE(self):
-
-        self.print_step("precondition", "Commissioning - already done")
+    async def test_TC_CADMIN_1_10(self):
 
         self.TH1 = self.default_controller
 
-        self.print_step("precondition", "Create Second Controller")
-
         fabric_admin = self.certificate_authority_manager.activeCaList[0].adminList[0]
         self.TH2_nodeid = self.matter_test_config.controller_node_id + 1
         self.TH2 = fabric_admin.NewController(
@@ -63,15 +80,17 @@ async def test_TestRevokeCommissioningClearsPASE(self):
             paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
         )
 
-        self.print_step(1, "TH1 sends an OpenCommissioningWindow command to DUT to allow it to be commissioned by TH2")
+        self.step("precondition")
+        # Commission DUT - already done
+
+        self.step(1)
         resp = await self.open_commissioning_window()
 
-        self.print_step(2, "TH2 establishes a PASE session with DUT")
+        self.step(2)
         pase_node_id = self.dut_node_id + 1
         await self.TH2.FindOrEstablishPASESession(setupCode=resp.commissioningParameters.setupQRCode, nodeId=pase_node_id)
 
-        self.print_step(3, "Read VendorName from BasicInformation Cluster using TH2 over PASE, to ensure PASE session is established")
-
+        self.step(3)
         VendorNameAttr = Clusters.BasicInformation.Attributes.VendorName
         ROOT_NODE_ENDPOINT_ID = 0
 
@@ -86,13 +105,11 @@ async def test_TestRevokeCommissioningClearsPASE(self):
             "VendorName should be present in the read response"
         )
 
-        self.print_step(4, "TH1 Sends RevokeCommissioning (over CASE) to clear PASE session on DUT")
+        self.step(4)
         revokeCmd = Clusters.AdministratorCommissioning.Commands.RevokeCommissioning()
         await self.TH1.SendCommand(nodeId=self.dut_node_id, endpoint=0, payload=revokeCmd, timedRequestTimeoutMs=6000)
 
-        self.print_step(
-            5, "Ensure that the PASE Session got cleared, by attempting to read VendorName using TH2 (over PASE) and Ensuring that the Command times out")
-
+        self.step(5)
         _CHIP_TIMEOUT_ERROR = 50
 
         with asserts.assert_raises(ChipStackError) as e:
@@ -104,9 +121,7 @@ async def test_TestRevokeCommissioningClearsPASE(self):
 
         # ---------------------------- Repeat test, but sending RevokeCommissioning over PASE this time --------------------------------
 
-        self.print_step(
-            6, "recreate Second Controller; to establish a new PASE session and repeat test, but sending RevokeCommissioning over PASE this time")
-
+        self.step(6)
         self.TH2.Shutdown()
         fabric_admin = self.certificate_authority_manager.activeCaList[0].adminList[0]
         self.TH2_nodeId = self.matter_test_config.controller_node_id + 1
@@ -115,19 +130,16 @@ async def test_TestRevokeCommissioningClearsPASE(self):
             paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
         )
 
-        self.print_step(7, "TH1 sends an OpenCommissioningWindow command to DUT to allow it to be commissioned by TH2")
+        self.step(7)
         resp = await self.open_commissioning_window()
 
-        self.print_step(8, "TH2 establishes a PASE session with DUT")
+        self.step(8)
         await self.TH2.FindOrEstablishPASESession(setupCode=resp.commissioningParameters.setupQRCode, nodeId=pase_node_id)
 
-        self.print_step(9, "TH2 Sends RevokeCommissioning (Over PASE) to clear PASE session on DUT")
-
+        self.step(9)
         await self.TH2.SendCommand(nodeId=pase_node_id, endpoint=0, payload=revokeCmd, timedRequestTimeoutMs=6000)
 
-        self.print_step(
-            10, "Ensure that the PASE Session got cleared, by attempting to read VendorName using TH2 (over PASE) and Ensuring that the Command times out")
-
+        self.step(10)
         with asserts.assert_raises(ChipStackError) as e:
             await self.TH2.ReadAttribute(
                 nodeId=pase_node_id,
diff --git a/src/python_testing/TC_CADMIN_1_27.py b/src/python_testing/TC_CADMIN_1_27.py
index 524e8996b18..10b154002af 100644
--- a/src/python_testing/TC_CADMIN_1_27.py
+++ b/src/python_testing/TC_CADMIN_1_27.py
@@ -124,6 +124,9 @@ def steps_TC_CADMIN_1_27(self) -> list[TestStep]:
                      "TH_AJF2 is successfuly commissioned into Fabric 1 by DUT_AAF using Joint Commissioning Method")
         ]
 
+    def pics_TC_CADMIN_1_27(self):
+        return ['CADMIN.S']
+
     @async_test_body
     async def test_TC_CADMIN_1_27(self):
         _devCtrlEcoA = None
@@ -419,14 +422,16 @@ async def test_TC_CADMIN_1_27(self):
             asserts.fail(f'Exception {e} occured during OJCW')
 
         self.step("4")
+        log.info("Setup event on fabric_a_admin for JCM completion message")
+        self.fabric_a_admin.set_output_match("[JF] Joint Commissioning Method (nodeId=15) success")
+        self.fabric_a_admin.event.clear()
+
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork-long 15 {response.setupPinCode} {discriminator} --jcm true",
             expected_output="[CTL] Commissioning complete for node ID 0x000000000000000F: success",
             timeout=60)
 
         log.info("Waiting for transfer of ownership from the commissioner(controller) to the administrator and completion of commissioning")
-        self.fabric_a_admin.set_output_match("[JF] Joint Commissioning Method (nodeId=15) success")
-        self.fabric_a_admin.event.clear()
         if self.fabric_a_admin.event.wait(30) is False:
             raise TimeoutError("Timed out waiting for commissioning to complete")
         log.info("JCM commissioning complete")
diff --git a/src/python_testing/TC_CADMIN_1_28.py b/src/python_testing/TC_CADMIN_1_28.py
index e3d56ceb237..1cf74ca8ca7 100644
--- a/src/python_testing/TC_CADMIN_1_28.py
+++ b/src/python_testing/TC_CADMIN_1_28.py
@@ -131,6 +131,9 @@ def steps_TC_CADMIN_1_28(self) -> list[TestStep]:
                      "DUT_AJF NOC from JointFabric should contain Administrator CAT")
         ]
 
+    def pics_TC_CADMIN_1_28(self):
+        return ['CADMIN.S']
+
     @async_test_body
     async def test_TC_CADMIN_1_28(self):
         _devCtrlEcoA = None
@@ -351,14 +354,16 @@ async def test_TC_CADMIN_1_28(self):
         log.info(f"Successfully found service with CM={service_found.cm}, D={service_found.d}")
 
         self.step("5")
+        log.info("Setup event on fabric_a_admin for JCM completion message")
+        self.fabric_a_admin.set_output_match("[JF] Joint Commissioning Method (nodeId=15) success")
+        self.fabric_a_admin.event.clear()
+
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork-long 15 {response.setupPinCode} {discriminator} --jcm true",
             expected_output="[CTL] Commissioning complete for node ID 0x000000000000000F: success",
             timeout=60)
 
         log.info("Waiting for transfer of ownership from the commissioner(controller) to the administrator and completion of commissioning")
-        self.fabric_a_admin.set_output_match("[JF] Joint Commissioning Method (nodeId=15) success")
-        self.fabric_a_admin.event.clear()
         if self.fabric_a_admin.event.wait(30) is False:
             raise TimeoutError("Timed out waiting for commissioning to complete")
         log.info("JCM commissioning complete")
diff --git a/src/python_testing/TC_FAN_4_1.py b/src/python_testing/TC_FAN_4_1.py
index 5a22350c7db..a97315961bd 100644
--- a/src/python_testing/TC_FAN_4_1.py
+++ b/src/python_testing/TC_FAN_4_1.py
@@ -287,7 +287,7 @@ async def verify_onoff_off(attr: Clusters.ClusterObjects.ClusterAttributeDescrip
             await verify_onoff_off(attr=fan.Attributes.SpeedSetting(speed_max), expected_mode=fan.Enums.FanModeEnum.kHigh, expected_percent_setting=None, expected_speed_setting=speed_max)
             await verify_onoff_off(attr=fan.Attributes.SpeedSetting(0), expected_mode=fan.Enums.FanModeEnum.kOff, expected_percent_setting=0, expected_speed_setting=0)
         else:
-            for i in range(2*num_substeps + 1):
+            for i in range(2*num_substeps):
                 self.skip_step(step_num + i)
             step_num += 2 * num_substeps
 
diff --git a/src/python_testing/TC_GCAST_2_1.py b/src/python_testing/TC_GCAST_2_1.py
index 83a14ec0ef9..32dd06d4862 100644
--- a/src/python_testing/TC_GCAST_2_1.py
+++ b/src/python_testing/TC_GCAST_2_1.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
diff --git a/src/python_testing/TC_GCAST_2_2.py b/src/python_testing/TC_GCAST_2_2.py
new file mode 100644
index 00000000000..534ea2e6fcb
--- /dev/null
+++ b/src/python_testing/TC_GCAST_2_2.py
@@ -0,0 +1,477 @@
+#
+#    Copyright (c) 2025 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.
+#
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_CLUSTERS_APP}
+#     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 1234
+#       --passcode 20202021
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --endpoint 1
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+import secrets
+
+from mobly import asserts
+from TC_GCAST_common import generate_membership_entry_matcher, get_feature_map, valid_endpoints_list
+
+import matter.clusters as Clusters
+from matter.interaction_model import InteractionModelError, Status
+from matter.testing.decorators import has_cluster, run_if_endpoint_matches
+from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler
+from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.runner import TestStep, default_matter_test_main
+from matter.tlv import uint
+
+logger = logging.getLogger(__name__)
+
+
+class TC_GCAST_2_2(MatterBaseTest):
+    def desc_TC_GCAST_2_2(self):
+        return "[TC-GCAST-2.2] JoinGroup as Listener or Sender with DUT as Server - Provisional"
+
+    def steps_TC_GCAST_2_2(self):
+        return [TestStep("1a", "Commission DUT to TH (can be skipped if done in a preceding test)", is_commissioning=True),
+                TestStep("1b", "TH removes any existing group and KeySetID on the DUT"),
+                TestStep("1c", "Th subscribes to Membership attribute with min interval 0s and max interval 30s"),
+                TestStep(2, "If GCAST.S.F00(LN) feature is not supported on the cluster, skip to step 14"),
+                TestStep("3a", "Attempt to join Group G1 with a new Key with KeySetID K1 on Endpoint EP1"),
+                TestStep("3b", "TH awaits subscription report of new membership within max interval"),
+                TestStep("4a", "If DUT only support one non-root and non-aggregator endpoint, skip to step 6a"),
+                TestStep("4b", "Attempt to add EP2 to Group G1"),
+                TestStep("4c", "TH awaits subscription report of new membership within max interval"),
+                TestStep("5a", "Attempt to replace endpoints with only EP1 for Group G1 using ReplaceEndpoints"),
+                TestStep("5b", "TH awaits subscription report of new membership within max interval"),
+                TestStep("6a", "Attempt to join Group G2 with existing Key1 and using Auxiliary ACL"),
+                TestStep("6b", "TH awaits subscription report of new membership within max interval"),
+                TestStep(7, "Attempt to join Group G3 using a new Key but providing existing KeySetID (result: already exists)"),
+                TestStep(8, "Attempt to join Group G3 using a new KeySetID, but without providing InputKey (result: not found)"),
+                TestStep(9, "Attempt to join Group G3 with invalid endpoint (result: unsupported endpoint)"),
+                TestStep(10, "Attempt to join Group G3 with Root endpoint 0 (result: unsupported endpoint)"),
+                TestStep(11, "If Sender is supported in DUT, skip this step. Else, attempt to join Group G3 with an empty endpoints list (result: constraint error)"),
+                TestStep(12, "If DUT has more than 20 endpoints, attempt to join Group G3 with 21 endpoints (result: constraint error)"),
+                TestStep(13, "If PerGroupAddress is supported on the cluster skip this step, else attempt to join Group G3 with McastAddrPolicy=PerGroup (result: constraint error)"),
+                TestStep(14, "If Sender is not supported in DUT, skip to step 20"),
+                TestStep("15a", "Attempt to join Group G4 as Sender (no endpoints) and a new key"),
+                TestStep("15b", "If Listener is not supported, skip this step. Else TH awaits subscription report of new membership within max interval with Endpoints list empty and HasAuxiliaryACL=False"),
+                TestStep("15c", "If Listener is supported, skip this step. Else, TH awaits subscription report of new membership within max interval with Endpoints list and HasAuxiliaryACL ommited"),
+                TestStep("16a", "Attempt to join Group G5 as Sender using existing KeySetID"),
+                TestStep("16b", "If Listener is not supported, skip this step. Else, TH awaits subscription report of new membership within max interval with Endpoints list empty and HasAuxiliaryACL=False"),
+                TestStep("16c", "If Listener is supported, skip this step. Else, TH awaits subscription report of new membership within max interval with Endpoints list and HasAuxiliaryACL ommited"),
+                TestStep("17a", "Attempt to join Group G5 with new Key but providing existing KeySetID (result: already exists)"),
+                TestStep("17b", "Attempt to join Group G5 with new KeySetID but without providing InputKey (result: not found)"),
+                TestStep(18, "If Listener feature is supported, skip this step. Else, attempt to join a group with ReplaceEndpoints=True (result: constraint error)"),
+                TestStep(
+                    19, "If Listener feature is supported, skip this step. Else, attempt to join a group with AuxiliaryACL true (result: constraint error)"),
+                TestStep(20, "JoinGroup with invalid GroupID (result: constraint error)"),
+                TestStep(21, "JoinGroup with Key length != 16 (result: constraint error)")]
+
+    def pics_TC_GCAST_2_2(self) -> list[str]:
+        return ["GCAST.S"]
+
+    @run_if_endpoint_matches(has_cluster(Clusters.Groupcast))
+    async def test_TC_GCAST_2_2(self):
+        groupcast_cluster = Clusters.Objects.Groupcast
+        membership_attribute = Clusters.Groupcast.Attributes.Membership
+
+        # Commission DUT to TH (can be skipped if done in a preceding test)
+        self.step("1a")
+        ln_enabled, sd_enabled, pga_enabled = await get_feature_map(self)
+        endpoints_list = await valid_endpoints_list(self, ln_enabled)
+        if endpoints_list[0] is None:
+            self.mark_all_remaining_steps_skipped("1b")
+            return
+
+        self.step("1b")
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, membership_attribute)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
+
+        # Th subscribes to Membership attribute with min interval 0s and max interval 30s
+        self.step("1c")
+        membership_sub = AttributeSubscriptionHandler(groupcast_cluster, membership_attribute)
+        await membership_sub.start(self.default_controller, self.dut_node_id, self.get_endpoint(), min_interval_sec=0, max_interval_sec=30)
+
+        # If GCAST.S.F00(LN) feature is not supported on the cluster, skip to step 12
+        self.step(2)
+        if not ln_enabled:
+            self.mark_step_range_skipped("3a", 13)
+        else:
+            # Attempt to join Group G1 with a new Key with KeySetID K1 on Endpoint EP1
+            self.step("3a")
+            groupID1 = 1
+            keySetID1 = 1
+            inputKey1 = secrets.token_bytes(16)
+            endpoint1 = endpoints_list[0]
+
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID1,
+                endpoints=[endpoint1],
+                keySetID=keySetID1,
+                key=inputKey1,
+                useAuxiliaryACL=False)
+            )
+
+            # TH awaits subscription report of new membership within max interval
+            self.step("3b")
+            membership_matcher = generate_membership_entry_matcher(
+                group_id=groupID1, endpoints=[endpoint1], key_set_id=keySetID1, has_auxiliary_acl=False)
+            membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            # If DUT only support one non-root and non-aggregator endpoint, skip to step 6a
+            self.step("4a")
+            if len(endpoints_list) < 2:
+                self.mark_step_range_skipped("4b", "5b")
+            else:
+                # Attempt to add EP2 to Group G1
+                self.step("4b")
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID1,
+                    endpoints=[endpoints_list[1]],
+                    keySetID=keySetID1,
+                    useAuxiliaryACL=False)
+                )
+
+                # TH awaits subscription report of new membership within max interval
+                self.step("4c")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID1, endpoints=endpoints_list[0:2], key_set_id=keySetID1, has_auxiliary_acl=False)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+                # Attempt to replace endpoints for Group G1 using ReplaceEndpoints:
+                self.step("5a")
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID1,
+                    endpoints=[endpoint1],
+                    keySetID=keySetID1,
+                    replaceEndpoints=True)
+                )
+
+                # TH awaits subscription report of new membership within max interval
+                self.step("5b")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID1, endpoints=[endpoint1], key_set_id=keySetID1, has_auxiliary_acl=False)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            # Attempt to join Group G2 with existing Key1 and using Auxiliary ACL
+            self.step("6a")
+            groupID2 = 2
+
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID2,
+                endpoints=[endpoint1],
+                keySetID=keySetID1,
+                useAuxiliaryACL=True)
+            )
+
+            # TH awaits subscription report of new membership within max interval
+            self.step("6b")
+            membership_matcher = generate_membership_entry_matcher(
+                group_id=groupID2, endpoints=[endpoint1], key_set_id=keySetID1, has_auxiliary_acl=True)
+            membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            # Attempt to join Group G3 using a new Key but providing existing KeySetID (result: already exists)
+            self.step(7)
+            groupID3 = 3
+            inputKey2 = secrets.token_bytes(16)
+
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID3,
+                    endpoints=[endpoint1],
+                    keySetID=keySetID1,
+                    key=inputKey2)
+                )
+                asserts.fail(
+                    "JoinGroup command should have failed because Group with keySetID already exists and does not match key, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.AlreadyExists,
+                                     f"Send JoinGroup command error should be {Status.AlreadyExists} instead of {e.status}")
+
+            # Attempt to join Group G3 using a new KeySetID, but without providing InputKey (result: not found)
+            self.step(8)
+            keySetID2 = 2
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID3,
+                    endpoints=[endpoint1],
+                    keySetID=keySetID2)
+                )
+                asserts.fail("JoinGroup command should have failed because no Key found, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.NotFound,
+                                     f"Send JoinGroup command error should be {Status.NotFound} instead of {e.status}")
+
+            # Attempt to join Group G3 with invalid endpoint (result: unsupported endpoint)
+            self.step(9)
+            endpoint_invalid = uint(0xFFFF)
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID3,
+                    endpoints=[endpoint_invalid],
+                    keySetID=keySetID1)
+                )
+                asserts.fail("JoinGroup command should have failed because endpoint is invalid, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.UnsupportedEndpoint,
+                                     f"Send JoinGroup command error should be {Status.UnsupportedEndpoint} instead of {e.status}")
+
+            # Attempt to join Group G3 with root endpoint (result: unsupported endpoint)
+            self.step(10)
+            endpoint_root = uint(0)
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID3,
+                    endpoints=[endpoint_root],
+                    keySetID=keySetID1)
+                )
+                asserts.fail("JoinGroup command should have failed because endpoint is invalid, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.UnsupportedEndpoint,
+                                     f"Send JoinGroup command error should be {Status.UnsupportedEndpoint} instead of {e.status}")
+
+            # If Sender is supported in DUT, skip this step. Else, attempt to join Group G3 with an empty endpoints list (result: constraint error)
+            endpoints_list_empty = []
+            if sd_enabled:
+                self.skip_step(11)
+            else:
+                self.step(11)
+                try:
+                    await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                        groupID=groupID3,
+                        endpoints=endpoints_list_empty,
+                        keySetID=keySetID1)
+                    )
+                    asserts.fail("JoinGroup command should have failed because endpoints list is empty, but it still succeeded")
+                except InteractionModelError as e:
+                    asserts.assert_equal(e.status, Status.ConstraintError,
+                                         f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+            # If DUT has more than 20 endpoints, attempt to join Group G3 with 21 endpoints (result: constraint error)
+            if len(endpoints_list) > 20:
+                self.step(12)
+                exceeding_endpoint = 21
+                while exceeding_endpoint in endpoints_list:
+                    exceeding_endpoint += 1
+                endpoints_list_exceeds_DUT_endpoints = endpoints_list + [exceeding_endpoint]
+                try:
+                    await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                        groupID=groupID3,
+                        endpoints=endpoints_list_exceeds_DUT_endpoints,
+                        keySetID=keySetID2)
+                    )
+                    asserts.fail(
+                        "JoinGroup command should have failed because endpoints list has more endpoints than supported by the command, but it still succeeded")
+                except InteractionModelError as e:
+                    asserts.assert_equal(e.status, Status.ConstraintError,
+                                         f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+            else:
+                self.skip_step(12)
+
+            # If PerGroupAddress is supported on the cluster skip this step, else attempt to join Group G3 with McastAddrPolicy=PerGroup (result: constraint error)
+            if pga_enabled:
+                self.skip_step(13)
+            else:
+                self.step(13)
+                try:
+                    await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                        groupID=groupID3,
+                        endpoints=[endpoint1],
+                        keySetID=keySetID1,
+                        mcastAddrPolicy=Clusters.Groupcast.McastAddrPolicy.PerGroup)
+                    )
+                    asserts.fail(
+                        "JoinGroup command should have failed because McastAddrPolicy is not supported, but it still succeeded")
+                except InteractionModelError as e:
+                    asserts.assert_equal(e.status, Status.ConstraintError,
+                                         f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+        # If Sender is not supported in DUT, skip to step 20
+        self.step(14)
+        if not sd_enabled:
+            self.mark_step_range_skipped("15a", 19)
+        else:
+            self.step("15a")
+            # Attempt to join Group G4 as Sender (no endpoints) and a new key
+            groupID4 = 4
+            keySetID2 = 2
+            inputKey2 = secrets.token_bytes(16)
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID4,
+                endpoints=endpoints_list_empty,
+                keySetID=keySetID2,
+                key=inputKey2)
+            )
+
+            if ln_enabled:
+                # TH awaits subscription report of new membership within max interval
+                self.step("15b")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID4, key_set_id=keySetID2, endpoints=endpoints_list_empty, has_auxiliary_acl=False)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+                self.skip_step("15c")
+            else:
+                self.skip_step("15b")
+                self.step("15c")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID4, key_set_id=keySetID2, endpoints=None)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            # Attempt to join Group G5 as Sender using existing KeySetID
+            self.step("16a")
+            groupID5 = 5
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID5,
+                endpoints=endpoints_list_empty,
+                keySetID=keySetID2)
+            )
+
+            # TH awaits subscription report of new membership within max interval
+            if ln_enabled:
+                self.step("16b")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID5, key_set_id=keySetID2, endpoints=endpoints_list_empty, has_auxiliary_acl=False)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+                self.skip_step("16c")
+            else:
+                self.skip_step("16b")
+                self.step("16c")
+                membership_matcher = generate_membership_entry_matcher(
+                    group_id=groupID5, key_set_id=keySetID2, endpoints=None)
+                membership_sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            # Attempt to join Group G5 with new Key but providing existing KeySetID (result: already exists)
+            self.step("17a")
+            inputKey3 = secrets.token_bytes(16)
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID5,
+                    endpoints=endpoints_list_empty,
+                    keySetID=keySetID2,
+                    key=inputKey3)
+                )
+                asserts.fail(
+                    "JoinGroup command should have failed because Group with keySetID already exists and does not match key, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.AlreadyExists,
+                                     f"Send JoinGroup command error should be {Status.AlreadyExists} instead of {e.status}")
+
+            # Attempt to join Group G5 with new Key but without providing InputKey (result: not found)
+            self.step("17b")
+            keySetID3 = 3
+            try:
+                await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID5,
+                    endpoints=endpoints_list_empty,
+                    keySetID=keySetID3)
+                )
+                asserts.fail("JoinGroup command should have failed because no Key found, but it still succeeded")
+            except InteractionModelError as e:
+                asserts.assert_equal(e.status, Status.NotFound,
+                                     f"Send JoinGroup command error should be {Status.NotFound} instead of {e.status}")
+
+            if ln_enabled:
+                self.skip_step(18)
+            else:
+                self.step(18)
+                try:
+                    await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                        groupID=groupID5,
+                        endpoints=endpoints_list_empty,
+                        keySetID=keySetID2,
+                        replaceEndpoints=True)
+                    )
+                    asserts.fail("JoinGroup command should have failed because listener cannot do JoinGroup commands, but it still succeeded")
+                except InteractionModelError as e:
+                    asserts.assert_equal(e.status, Status.ConstraintError,
+                                         f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+            # If Listener feature is not supported, attempt to join a group with AuxiliaryACL (result: constraint error)
+            if ln_enabled:
+                self.skip_step(19)
+            else:
+                self.step(19)
+                try:
+                    await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                        groupID=groupID5,
+                        endpoints=endpoints_list_empty,
+                        keySetID=keySetID2,
+                        useAuxiliaryACL=True)
+                    )
+                    asserts.fail("JoinGroup command should have failed because listener cannot do JoinGroup commands, but it still succeeded")
+                except InteractionModelError as e:
+                    asserts.assert_equal(e.status, Status.ConstraintError,
+                                         f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+        # conditional endpoints list for step 20 and 21
+        valid_endpoints = endpoints_list_empty
+        if ln_enabled:
+            valid_endpoints = [endpoint1]
+
+        # JoinGroup with invalid GroupID=0 (result: constraint error)
+        self.step(20)
+        groupID0 = 0
+        try:
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID0, endpoints=valid_endpoints, keySetID=1)
+            )
+            asserts.fail("JoinGroup command should have failed because GroupID cannot be 0, but it still succeeded")
+        except InteractionModelError as e:
+            asserts.assert_equal(e.status, Status.ConstraintError,
+                                 f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+        # JoinGroup with Key length != 16 (result: constraint error)
+        self.step(21)
+        inputKeyLong = secrets.token_bytes(17)
+        keySetID4 = 4
+        groupID6 = 6
+        try:
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID6,
+                endpoints=valid_endpoints,
+                keySetID=keySetID4,
+                key=inputKeyLong)
+            )
+            asserts.fail("JoinGroup command should have failed because Key length is not 16 bytes, but it still succeeded")
+        except InteractionModelError as e:
+            asserts.assert_equal(e.status, Status.ConstraintError,
+                                 f"Send JoinGroup command error should be {Status.ConstraintError} instead of {e.status}")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_GCAST_2_3.py b/src/python_testing/TC_GCAST_2_3.py
index ecb14a0159c..b9903494a51 100644
--- a/src/python_testing/TC_GCAST_2_3.py
+++ b/src/python_testing/TC_GCAST_2_3.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -87,7 +87,19 @@ async def test_TC_GCAST_2_3(self):
         endpoints_list = [endpoints_list[0]]
 
         self.step("1b")
-        await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, membership_attribute)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
 
         self.step("1c")
         sub = AttributeSubscriptionHandler(groupcast_cluster, membership_attribute)
diff --git a/src/python_testing/TC_GCAST_2_4.py b/src/python_testing/TC_GCAST_2_4.py
index 90d2eee7879..9d2ed50de81 100644
--- a/src/python_testing/TC_GCAST_2_4.py
+++ b/src/python_testing/TC_GCAST_2_4.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -93,7 +93,19 @@ async def test_TC_GCAST_2_4(self):
             endpoints_list = endpoints_list[:2]
 
         self.step("1b")
-        await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, membership_attribute)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
 
         self.step("1c")
         sub = AttributeSubscriptionHandler(groupcast_cluster, membership_attribute)
@@ -132,51 +144,51 @@ async def test_TC_GCAST_2_4(self):
         self.step(3)
         if not ln_enabled:
             self.mark_step_range_skipped("4a", "4f")
-
-        self.step("4a")
-        groupID3 = 3
-        await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
-            groupID=groupID3,
-            endpoints=endpoints_list,
-            keySetID=keySetID1)
-        )
-
-        self.step("4b")
-        if len(endpoints_list) == 1:
-            self.mark_step_range_skipped("4c", "4d")
-
-        self.step("4c")
-        endpoint_2 = [endpoints_list[1]]
-        resp: Clusters.Groupcast.Commands.LeaveGroupResponse = await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(
-            groupID=groupID3,
-            endpoints=endpoint_2)
-        )
-        asserts.assert_is_not_none(resp.endpoints, "LeaveGroupResponse endpoints should not be None")
-        asserts.assert_equal(resp.endpoints, endpoint_2,
-                             f"LeaveGroupResponse cmd endpoints list {resp.endpoints} is not equal to {endpoint_2}")
-
-        self.step("4d")
-        sub.reset()
-        membership_matcher = generate_membership_entry_matcher(groupID3, endpoints=[endpoints_list[0]])
-        sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
-
-        self.step("4e")
-        endpoint_1 = [endpoints_list[0]]
-        resp: Clusters.Groupcast.Commands.LeaveGroupResponse = await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(
-            groupID=groupID3,
-            endpoints=endpoint_1)
-        )
-        asserts.assert_is_not_none(resp.endpoints, "LeaveGroupResponse endpoints should not be None")
-        asserts.assert_equal(resp.endpoints, endpoint_1,
-                             f"LeaveGroupResponse cmd endpoints list {resp.endpoints} is not equal to {endpoint_1}")
-
-        self.step("4f")
-        if sd_enabled:
-            membership_matcher = generate_membership_entry_matcher(groupID3, endpoints=[])
-            sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
         else:
-            membership_matcher = generate_membership_entry_matcher(groupID3, test_for_exists=False)
-            sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+            self.step("4a")
+            groupID3 = 3
+            await self.send_single_cmd(Clusters.Groupcast.Commands.JoinGroup(
+                groupID=groupID3,
+                endpoints=endpoints_list,
+                keySetID=keySetID1)
+            )
+
+            self.step("4b")
+            if len(endpoints_list) == 1:
+                self.mark_step_range_skipped("4c", "4d")
+            else:
+                self.step("4c")
+                endpoint_2 = [endpoints_list[1]]
+                resp: Clusters.Groupcast.Commands.LeaveGroupResponse = await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(
+                    groupID=groupID3,
+                    endpoints=endpoint_2)
+                )
+                asserts.assert_is_not_none(resp.endpoints, "LeaveGroupResponse endpoints should not be None")
+                asserts.assert_equal(resp.endpoints, endpoint_2,
+                                     f"LeaveGroupResponse cmd endpoints list {resp.endpoints} is not equal to {endpoint_2}")
+
+                self.step("4d")
+                sub.reset()
+                membership_matcher = generate_membership_entry_matcher(groupID3, endpoints=[endpoints_list[0]])
+                sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+
+            self.step("4e")
+            endpoint_1 = [endpoints_list[0]]
+            resp: Clusters.Groupcast.Commands.LeaveGroupResponse = await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(
+                groupID=groupID3,
+                endpoints=endpoint_1)
+            )
+            asserts.assert_is_not_none(resp.endpoints, "LeaveGroupResponse endpoints should not be None")
+            asserts.assert_equal(resp.endpoints, endpoint_1,
+                                 f"LeaveGroupResponse cmd endpoints list {resp.endpoints} is not equal to {endpoint_1}")
+
+            self.step("4f")
+            if sd_enabled:
+                membership_matcher = generate_membership_entry_matcher(groupID3, endpoints=None)
+                sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
+            else:
+                membership_matcher = generate_membership_entry_matcher(groupID3, test_for_exists=False)
+                sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
 
         self.step(5)
         groupIDUnknown = 100
diff --git a/src/python_testing/TC_GCAST_2_5.py b/src/python_testing/TC_GCAST_2_5.py
index 1c55b82c186..259857a1059 100644
--- a/src/python_testing/TC_GCAST_2_5.py
+++ b/src/python_testing/TC_GCAST_2_5.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -83,11 +83,25 @@ async def test_TC_GCAST_2_5(self):
         if not ln_enabled:
             logger.info("Listener feature is not enabled, skip remaining steps.")
             self.mark_all_remaining_steps_skipped("1b")
+            return
+
         endpoints_list = await valid_endpoints_list(self, ln_enabled)
         endpoints_list = [endpoints_list[0]]
 
         self.step("1b")
-        await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, membership_attribute)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
 
         self.step("1c")
         sub = AttributeSubscriptionHandler(groupcast_cluster, membership_attribute)
@@ -112,7 +126,7 @@ async def test_TC_GCAST_2_5(self):
         )
 
         self.step(3)
-        membership_matcher = generate_membership_entry_matcher(groupID1, has_auxiliary_acl="true")
+        membership_matcher = generate_membership_entry_matcher(groupID1, has_auxiliary_acl=True)
         sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
 
         self.step(4)
@@ -123,7 +137,7 @@ async def test_TC_GCAST_2_5(self):
 
         self.step(5)
         sub.reset()
-        membership_matcher = generate_membership_entry_matcher(groupID1, has_auxiliary_acl="false")
+        membership_matcher = generate_membership_entry_matcher(groupID1, has_auxiliary_acl=False)
         sub.await_all_expected_report_matches(expected_matchers=[membership_matcher], timeout_sec=60)
 
         self.step(6)
@@ -140,6 +154,7 @@ async def test_TC_GCAST_2_5(self):
 
         if not sd_enabled:
             self.mark_all_remaining_steps_skipped("7")
+            return
 
         self.step(7)
         groupID2 = 2
diff --git a/src/python_testing/TC_GCAST_2_6.py b/src/python_testing/TC_GCAST_2_6.py
index 05c8cdcb004..55f867ca0a9 100644
--- a/src/python_testing/TC_GCAST_2_6.py
+++ b/src/python_testing/TC_GCAST_2_6.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -114,8 +114,19 @@ async def test_TC_GCAST_2_6(self):
         )
 
         self.step("1c")
-        groupID0 = 0
-        await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=groupID0))
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, Clusters.Groupcast.Attributes.Membership)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
 
         self.step(2)
         groupID1 = 1
diff --git a/src/python_testing/TC_GCAST_2_7.py b/src/python_testing/TC_GCAST_2_7.py
index 51a0065f3c5..a6573e60675 100644
--- a/src/python_testing/TC_GCAST_2_7.py
+++ b/src/python_testing/TC_GCAST_2_7.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -97,13 +97,26 @@ async def test_TC_GCAST_2_7(self):
         if not pga_enabled:
             logger.info("PerGroup feature is not enabled, skip remaining steps.")
             self.mark_all_remaining_steps_skipped("1b")
+            return
+
         endpoints_list = await valid_endpoints_list(self, ln_enabled)
         if len(endpoints_list) > 1:
             endpoints_list = [endpoints_list[0]]
 
         self.step("1b")
-        groupID0 = 0
-        await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=groupID0))
+        # Check if there are any groups on the DUT.
+        membership = await self.read_single_attribute_check_success(groupcast_cluster, membership_attribute)
+        if membership:
+            # LeaveGroup with groupID 0 will leave all groups on the fabric.
+            await self.send_single_cmd(Clusters.Groupcast.Commands.LeaveGroup(groupID=0))
+
+        # remove any existing KeySetID on the DUT, except KeySetId 0 (IPK).
+        resp: Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse = await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices())
+
+        read_group_key_ids: list[int] = resp.groupKeySetIDs
+        for key_set_id in read_group_key_ids:
+            if key_set_id != 0:
+                await self.send_single_cmd(Clusters.GroupKeyManagement.Commands.KeySetRemove(key_set_id))
 
         self.step("1c")
         sub = AttributeSubscriptionHandler(groupcast_cluster, membership_attribute)
@@ -169,59 +182,60 @@ async def test_TC_GCAST_2_7(self):
         usedMcastAddrCount_matcher = generate_usedMcastAddrCount_entry_matcher(2)
         sub2.await_all_expected_report_matches(expected_matchers=[usedMcastAddrCount_matcher], timeout_sec=60)
 
+        f2_current_group_count = 0
         self.step("6a")
         if A_max < math.floor(M_max / 2):
-            self.mark_step_range_skipped("6b", "8")
-
-        self.step("6b")
-        self.th1 = self.default_controller
-        self.discriminatorTH2 = random.randint(0, 4095)
-        # Create TH2 controller
-        th2_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
-        th2_fabric_admin = th2_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=self.th1.fabricId + 1)
-        self.th2 = th2_fabric_admin.NewController(nodeId=2, useTestCommissioner=True)
-
-        # Open commissioning window on TH1
-        params = await self.th1.OpenCommissioningWindow(
-            nodeId=self.dut_node_id,
-            timeout=900,
-            iteration=1000,
-            discriminator=self.discriminatorTH2,
-            option=1
-        )
-
-        # Commission TH2
-        await self.th2.CommissionOnNetwork(
-            nodeId=self.dut_node_id,
-            setupPinCode=params.setupPinCode,
-            filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR,
-            filter=self.discriminatorTH2
-        )
+            self.mark_step_range_skipped("6b", "7b")
+        else:
+            self.step("6b")
+            self.th1 = self.default_controller
+            self.discriminatorTH2 = random.randint(0, 4095)
+            # Create TH2 controller
+            th2_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
+            th2_fabric_admin = th2_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=self.th1.fabricId + 1)
+            self.th2 = th2_fabric_admin.NewController(nodeId=2, useTestCommissioner=True)
+
+            # Open commissioning window on TH1
+            params = await self.th1.OpenCommissioningWindow(
+                nodeId=self.dut_node_id,
+                timeout=900,
+                iteration=1000,
+                discriminator=self.discriminatorTH2,
+                option=1
+            )
 
-        self.step("7a")
-        groupID3 = 3
-        keySetID3 = 3
-        inputKey3 = secrets.token_bytes(16)
-        await self.send_single_cmd(dev_ctrl=self.th2, cmd=Clusters.Groupcast.Commands.JoinGroup(
-            groupID=groupID3,
-            endpoints=endpoints_list,
-            keySetID=keySetID3,
-            key=inputKey3,
-            mcastAddrPolicy=Clusters.Groupcast.Enums.MulticastAddrPolicyEnum.kPerGroup)
-        )
-        f2_current_group_count = 1
+            # Commission TH2
+            await self.th2.CommissionOnNetwork(
+                nodeId=self.dut_node_id,
+                setupPinCode=params.setupPinCode,
+                filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR,
+                filter=self.discriminatorTH2
+            )
 
-        self.step("7b")
-        f2_max_groups = math.floor(M_max / 2)
-        for i in range(f2_current_group_count, f2_max_groups):
-            groupID = i + 3
+            self.step("7a")
+            groupID3 = 3
+            keySetID3 = 3
+            inputKey3 = secrets.token_bytes(16)
             await self.send_single_cmd(dev_ctrl=self.th2, cmd=Clusters.Groupcast.Commands.JoinGroup(
-                groupID=groupID,
+                groupID=groupID3,
                 endpoints=endpoints_list,
                 keySetID=keySetID3,
+                key=inputKey3,
                 mcastAddrPolicy=Clusters.Groupcast.Enums.MulticastAddrPolicyEnum.kPerGroup)
             )
-            f2_current_group_count += 1
+            f2_current_group_count = 1
+
+            self.step("7b")
+            f2_max_groups = math.floor(M_max / 2)
+            for i in range(f2_current_group_count, f2_max_groups):
+                groupID = i + 3
+                await self.send_single_cmd(dev_ctrl=self.th2, cmd=Clusters.Groupcast.Commands.JoinGroup(
+                    groupID=groupID,
+                    endpoints=endpoints_list,
+                    keySetID=keySetID3,
+                    mcastAddrPolicy=Clusters.Groupcast.Enums.MulticastAddrPolicyEnum.kPerGroup)
+                )
+                f2_current_group_count += 1
 
         self.step(8)
         total_per_group_count = f1_current_group_count + f2_current_group_count
@@ -235,17 +249,17 @@ async def test_TC_GCAST_2_7(self):
             )
             f1_current_group_count += 1
 
-        self.step("9")
+        self.step(9)
         usedMcastAddrCount_matcher = generate_usedMcastAddrCount_entry_matcher(A_max)
         sub2.await_all_expected_report_matches(expected_matchers=[usedMcastAddrCount_matcher], timeout_sec=60)
 
-        self.step("10")
+        self.step(10)
         groupIDExhausted = A_max + 1
         try:
-            await self.send_single_cmd(dev_ctrl=self.th2, cmd=Clusters.Groupcast.Commands.JoinGroup(
+            await self.send_single_cmd(cmd=Clusters.Groupcast.Commands.JoinGroup(
                 groupID=groupIDExhausted,
                 endpoints=endpoints_list,
-                keySetID=keySetID3,
+                keySetID=keySetID1,
                 mcastAddrPolicy=Clusters.Groupcast.Enums.MulticastAddrPolicyEnum.kPerGroup)
             )
             asserts.fail("JoinGroup command should have failed with ResourceExhausted, but it succeeded")
diff --git a/src/python_testing/TC_GCAST_2.8.py b/src/python_testing/TC_GCAST_2_8.py
similarity index 97%
rename from src/python_testing/TC_GCAST_2.8.py
rename to src/python_testing/TC_GCAST_2_8.py
index d80cbdcf4ad..d11d07e2438 100644
--- a/src/python_testing/TC_GCAST_2.8.py
+++ b/src/python_testing/TC_GCAST_2_8.py
@@ -20,7 +20,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${LIGHTING_APP_NO_UNIQUE_ID}
+#     app: ${ALL_CLUSTERS_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -43,7 +43,7 @@
 from matter.testing.decorators import has_cluster, run_if_endpoint_matches
 from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler
 from matter.testing.matter_testing import MatterBaseTest
-from matter.testing.runner import TestStep
+from matter.testing.runner import TestStep, default_matter_test_main
 
 logger = logging.getLogger(__name__)
 
@@ -99,34 +99,34 @@ async def test_TC_GCAST_2_8(self):
         else:
             testOperation = Clusters.Groupcast.Enums.GroupcastTestingEnum.kEnableSenderTesting
 
+        sub.reset()
         await self.send_single_cmd(Clusters.Groupcast.Commands.GroupcastTesting(
             testOperation=testOperation)
         )
 
         self.step(4)
-        sub.reset()
         fabric_matcher = generate_fabric_under_test_matcher(F1)
         sub.await_all_expected_report_matches(expected_matchers=[fabric_matcher], timeout_sec=60)
 
         self.step(5)
+        sub.reset()
         await self.send_single_cmd(Clusters.Groupcast.Commands.GroupcastTesting(
             testOperation=Clusters.Groupcast.Enums.GroupcastTestingEnum.kDisableTesting)
         )
 
         self.step(6)
-        sub.reset()
         fabric_matcher = generate_fabric_under_test_matcher(0)
         sub.await_all_expected_report_matches(expected_matchers=[fabric_matcher], timeout_sec=60)
 
         self.step(7)
         durationSeconds = 10
+        sub.reset()
         await self.send_single_cmd(Clusters.Groupcast.Commands.GroupcastTesting(
             testOperation=testOperation,
             durationSeconds=durationSeconds)
         )
 
         self.step(8)
-        sub.reset()
         fabric_matcher = generate_fabric_under_test_matcher(F1)
         sub.await_all_expected_report_matches(expected_matchers=[fabric_matcher], timeout_sec=60)
 
@@ -134,3 +134,7 @@ async def test_TC_GCAST_2_8(self):
         sub.reset()
         fabric_matcher = generate_fabric_under_test_matcher(0)
         sub.await_all_expected_report_matches(expected_matchers=[fabric_matcher], timeout_sec=60)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_GCAST_common.py b/src/python_testing/TC_GCAST_common.py
index 7dc3d861f12..b719cdc798b 100644
--- a/src/python_testing/TC_GCAST_common.py
+++ b/src/python_testing/TC_GCAST_common.py
@@ -87,7 +87,7 @@ async def valid_endpoints_list(test, ln_enabled: bool) -> list:
 def generate_membership_entry_matcher(
     group_id: int,
     key_set_id: Optional[int] = None,
-    has_auxiliary_acl: Optional[str] = None,
+    has_auxiliary_acl: Optional[bool] = None,
     endpoints: Optional[list] = None,
     mcastAddrPolicy: Optional[Clusters.Groupcast.Enums.MulticastAddrPolicyEnum] = None,
     test_for_exists: bool = True,
diff --git a/src/python_testing/TC_IDM_2_3.py b/src/python_testing/TC_IDM_2_3.py
new file mode 100644
index 00000000000..13b93d7c1dd
--- /dev/null
+++ b/src/python_testing/TC_IDM_2_3.py
@@ -0,0 +1,230 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_DEVICES_APP}
+#     app-args: --device contact-sensor --discriminator 1234 --KVS kvs1
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 1234
+#       --passcode 20202021
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --PICS src/app/tests/suites/certification/ci-pics-values
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+import random
+
+from mobly import asserts
+
+import matter.clusters as Clusters
+from matter.clusters.Attribute import AttributePath
+from matter.testing import global_attribute_ids
+from matter.testing.basic_composition import BasicCompositionTests
+from matter.testing.decorators import async_test_body
+from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler
+from matter.testing.runner import TestStep, default_matter_test_main
+
+log = logging.getLogger(__name__)
+
+MAX_NUM_PATHS_IN_MTU = 50
+
+
+class TC_IDM_2_3(BasicCompositionTests):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.endpoint = 0
+
+    @property
+    def default_timeout(self) -> int:
+        return 5 * 60
+
+    def steps_TC_IDM_2_3(self) -> list[TestStep]:
+        return [
+            TestStep(1, "TH reads from the DUT the CapabilityMinima attribute from the Basic Information Cluster.", is_commissioning=True),
+            TestStep(2, "TH reads from the DUT all attributes from all clusters on all endpoints, to collect valid AttributePaths."),
+            TestStep(3, "TH sends a Read Request Message to the DUT with a number of paths up to the ReadPathsSupported value."),
+            TestStep(4, "TH sends a Subscribe Request Message to the DUT with a number of paths up to the SubscribePathsSupported value. TH then modifies one of the subscribed attributes and waits for a Report Data Action."),
+        ]
+
+    def verify_paths_in_response(self, requested_paths, response_tlv):
+        """Helper to verify that all requested paths are present in the response TLV data."""
+        for path in requested_paths:
+            endpoint_id = path.EndpointId
+            cluster_id = path.ClusterId
+            attribute_id = path.AttributeId
+
+            asserts.assert_in(endpoint_id, response_tlv,
+                              f"Endpoint {endpoint_id} missing in response")
+            asserts.assert_in(cluster_id, response_tlv[endpoint_id],
+                              f"Cluster {cluster_id} missing in response for endpoint {endpoint_id}")
+            asserts.assert_in(attribute_id, response_tlv[endpoint_id][cluster_id],
+                              f"Attribute {attribute_id} missing in response for endpoint {endpoint_id}, cluster {cluster_id}")
+
+    def get_paths(self, count, all_paths):
+        path_list = []
+        num_available_paths = len(all_paths)
+        for i in range(count):
+            # Use modulo to wrap around if count > num_available_paths
+            path_index = i % num_available_paths
+            path_list.append(all_paths[path_index])
+        return path_list
+
+    @async_test_body
+    async def test_TC_IDM_2_3(self):
+        # Setup class helper performs wildcard read and populates self.endpoints_tlv
+        await self.setup_class_helper(allow_pase=False)
+
+        # Step 1: CapabilityMinima
+        self.step(1)
+        cluster_revision = await self.read_single_attribute_check_success(
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.ClusterRevision
+        )
+
+        # Default values for number of read paths and subscribe paths
+        num_read_paths_supported = 9
+        num_subscribe_paths_supported = 3
+
+        capability_minima = await self.read_single_attribute_check_success(
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.CapabilityMinima
+        )
+
+        if cluster_revision >= 6:
+            asserts.assert_is_not_none(capability_minima.readPathsSupported,
+                                       "ReadPathsSupported should be present when ClusterRevision >= 6")
+            asserts.assert_is_not_none(capability_minima.subscribePathsSupported,
+                                       "SubscribePathsSupported should be present when ClusterRevision >= 6")
+
+            # Extract values, providing defaults if optional fields are missing
+            num_read_paths_supported = capability_minima.readPathsSupported
+            num_subscribe_paths_supported = capability_minima.subscribePathsSupported
+        else:
+            log.info("Basic Information Cluster revision is less than 6, read paths and subscribe paths are not part of CapabilityMinima struct.")
+
+        log.info(f"CapabilityMinima: readPathsSupported={num_read_paths_supported}, "
+                 f"subscribePathsSupported={num_subscribe_paths_supported}")
+
+        # Step 2: Collect available paths
+        self.step(2)
+        all_paths = []
+        for endpoint_id, clusters in self.endpoints_tlv.items():
+            for cluster_id, cluster_data in clusters.items():
+                if global_attribute_ids.cluster_id_type(cluster_id) != global_attribute_ids.ClusterIdType.kStandard:
+                    continue
+                # Use Global Attribute List to find valid attributes
+                attr_list = cluster_data.get(global_attribute_ids.GlobalAttributeIds.ATTRIBUTE_LIST_ID)
+                if attr_list:
+                    for attr_id in attr_list:
+                        all_paths.append(AttributePath(EndpointId=endpoint_id, ClusterId=cluster_id, AttributeId=attr_id))
+
+        if not all_paths:
+            # Fallback for empty devices (unlikely)
+            all_paths = [AttributePath(EndpointId=0, ClusterId=Clusters.BasicInformation.id,
+                                       AttributeId=Clusters.BasicInformation.Attributes.NodeLabel.attribute_id)]
+
+        # Step 3: Read max number of paths
+        self.step(3)
+        read_paths = self.get_paths(num_read_paths_supported, all_paths)
+
+        async def read_request(paths):
+            log.info("Conducting read request")
+            return await self.default_controller.Read(self.dut_node_id, paths)
+
+        # Read requests must fit into 1 MTU, as reads cannot be chained across multiple packets. If a device reports
+        # a number of read paths (or subscription paths) larger than what is possible on the controller side, we need to
+        # reduce the number of paths here to be as much as can fit in the request.
+        async def conduct_request_with_potential_path_size_reduction(paths, num_paths, request_function):
+            # TODO: The maximum here should be adjusted and be based upon the max size
+            # of an AttributePath, as well as the size of the payload for the MTU. See Issue #43083
+            if num_paths > MAX_NUM_PATHS_IN_MTU:
+                paths[:] = paths[:MAX_NUM_PATHS_IN_MTU]
+                log.info(f"Reduced number of paths used from {num_paths} to {MAX_NUM_PATHS_IN_MTU}")
+            return await request_function(paths)
+
+        read_response = await conduct_request_with_potential_path_size_reduction(read_paths, num_read_paths_supported, read_request)
+        asserts.assert_is_not_none(
+            read_response, "No response returned from read request. Ensure the number of paths in request is valid.")
+        self.verify_paths_in_response(read_paths, read_response.tlvAttributes)
+        log.info("Successfully completed read request")
+
+        # Step 4: Subscribe with max paths in a single request
+        self.step(4)
+
+        initial_node_label = await self.read_single_attribute_check_success(
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.NodeLabel
+        )
+
+        # TODO: Should have resilience to a missing node label
+        sub_paths = self.get_paths(num_subscribe_paths_supported, all_paths)
+        sub_paths[0] = AttributePath(EndpointId=0, ClusterId=Clusters.BasicInformation.id,
+                                     AttributeId=Clusters.BasicInformation.Attributes.NodeLabel.attribute_id)
+
+        handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.BasicInformation,
+            expected_attribute=Clusters.BasicInformation.Attributes.NodeLabel
+        )
+
+        async def subscribe_request(paths):
+            log.info("Conducting subscribe request")
+            return await self.default_controller.Read(
+                self.dut_node_id,
+                paths,
+                reportInterval=(1, 1000),
+                keepSubscriptions=False
+            )
+
+        sub_transaction = await conduct_request_with_potential_path_size_reduction(sub_paths, num_subscribe_paths_supported, subscribe_request)
+        asserts.assert_is_not_none(
+            sub_transaction, "No response returned from subscribe request. Ensure the number of paths in request is valid.")
+        log.info("Successfully completed subscribe request")
+        sub_transaction.SetAttributeUpdateCallback(handler)
+
+        # Write new NodeLabel to trigger a subscription report
+        # Generate a new label guaranteed different from initial state.
+        new_label = initial_node_label
+        while new_label == initial_node_label:
+            new_label = str(random.randint(0, 999999))
+        await self.write_single_attribute(
+            Clusters.BasicInformation.Attributes.NodeLabel(value=new_label),
+            endpoint_id=0
+        )
+
+        # Verify change of NodeLabel received.
+        handler.await_sequence_of_reports(
+            attribute=Clusters.BasicInformation.Attributes.NodeLabel,
+            sequence=[new_label],
+            timeout_sec=10
+        )
+
+        log.info("Successfully subscribed and verified report sequence.")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_JFADMIN_2_2.py b/src/python_testing/TC_JFADMIN_2_2.py
deleted file mode 100644
index 085aafc3416..00000000000
--- a/src/python_testing/TC_JFADMIN_2_2.py
+++ /dev/null
@@ -1,267 +0,0 @@
-#
-#    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.
-#
-
-# This test requires a TH_SERVER application. Please specify with --string-arg th_server_app_path:<path_to_app>
-
-# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
-# for details about the block below.
-#
-# === BEGIN CI TEST ARGUMENTS ===
-# test-runner-runs:
-#   run1:
-#     script-args: >
-#       --string-arg jfa_server_app:${JF_ADMIN_APP}
-#       --string-arg jfc_server_app:${JF_CONTROL_APP}
-#       --trace-to json:${TRACE_TEST_JSON}.json
-#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
-#     factory-reset: true
-#     quiet: true
-# === END CI TEST ARGUMENTS ===
-
-import asyncio
-import base64
-import logging
-import os
-import random
-import tempfile
-from configparser import ConfigParser
-
-from mobly import asserts
-
-import matter.clusters as Clusters
-from matter import CertificateAuthority
-from matter.interaction_model import InteractionModelError
-from matter.storage import VolatileTemporaryPersistentStorage
-from matter.testing.apps import AppServerSubprocess, JFControllerSubprocess
-from matter.testing.decorators import async_test_body
-from matter.testing.matter_testing import MatterBaseTest
-from matter.testing.runner import TestStep, default_matter_test_main
-
-log = logging.getLogger(__name__)
-
-
-class TC_JFADMIN_2_2(MatterBaseTest):
-
-    @async_test_body
-    async def setup_class(self):
-        super().setup_class()
-
-        self.fabric_a_ctrl = None
-        self.storage_fabric_a = self.user_params.get("fabric_a_storage", None)
-        self.fabric_a_server_app = None
-        self.cert_authority_manager_a = None
-
-        jfc_server_app = self.user_params.get("jfc_server_app", None)
-        if not jfc_server_app:
-            asserts.fail("This test requires a Joint Fabric Controller app. Specify app path with --string-arg jfc_server_app:<path_to_app>")
-        if not os.path.exists(jfc_server_app):
-            asserts.fail(f"The path {jfc_server_app} does not exist")
-
-        jfa_server_app = self.user_params.get("jfa_server_app", None)
-        if not jfa_server_app:
-            asserts.fail("This test requires a Joint Fabrics Admin app. Specify app path with --string-arg jfa_server_app:<path_to_app>")
-        if not os.path.exists(jfa_server_app):
-            asserts.fail(f"The path {jfa_server_app} does not exist")
-
-        # Create a temporary storage directory for both ecosystems to keep KVS files if not already provided by user.
-        if self.storage_fabric_a is None:
-            self.storage_directory_ecosystem_a = tempfile.TemporaryDirectory(prefix=self.__class__.__name__+"_A_")
-            self.storage_fabric_a = self.storage_directory_ecosystem_a.name
-            log.info("Temporary storage directory: %s", self.storage_fabric_a)
-
-        #####################################################################################################################################
-        #
-        # Initialize Ecosystem A
-        #
-        #####################################################################################################################################
-        self.jfadmin_fabric_a_passcode = random.randint(110220011, 110220999)
-        self.jfctrl_fabric_a_vid = random.randint(0x0001, 0xFFF0)
-
-        # Start Fabric A JF-Administrator App
-        self.fabric_a_admin = AppServerSubprocess(
-            jfa_server_app,
-            storage_dir=self.storage_fabric_a,
-            port=random.randint(5001, 5999),
-            discriminator=random.randint(0, 4095),
-            passcode=self.jfadmin_fabric_a_passcode,
-            extra_args=["--capabilities", "0x04", "--rpc-server-port", "33033"])
-        self.fabric_a_admin.start(
-            expected_output="Server initialization complete",
-            timeout=10)
-
-        # Start Fabric A JF-Controller App
-        self.fabric_a_ctrl = JFControllerSubprocess(
-            jfc_server_app,
-            "JFC_A",  # Name of the controller instance, used for logging purposes in the JF-Controller app:w
-            rpc_server_port=33033,
-            storage_dir=self.storage_fabric_a,
-            vendor_id=self.jfctrl_fabric_a_vid)
-        self.fabric_a_ctrl.start(
-            expected_output="CHIP task running",
-            timeout=10)
-
-        # # Commission JF-ADMIN app with JF-Controller on Fabric A
-        self.fabric_a_ctrl.send(
-            message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator (nodeId=1) commissioned with success",
-            timeout=10)
-
-        # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
-        jfcStorage = ConfigParser()
-        jfcStorage.read(os.path.join(self.storage_fabric_a, 'chip_tool_config.alpha.ini'))
-        self.ecoACtrlStorage = {
-            "sdk-config": {
-                "ExampleOpCredsCAKey1": jfcStorage.get("Default", "ExampleOpCredsCAKey0"),
-                "ExampleOpCredsICAKey1": jfcStorage.get("Default", "ExampleOpCredsICAKey0"),
-                "ExampleCARootCert1": jfcStorage.get("Default", "ExampleCARootCert0"),
-                "ExampleCAIntermediateCert1": jfcStorage.get("Default", "ExampleCAIntermediateCert0"),
-            },
-            "repl-config": {
-                "caList": {
-                    "1": [
-                        {
-                            "fabricId": 1,
-                            "vendorId": self.jfctrl_fabric_a_vid
-                        }
-                    ]
-                }
-            }
-        }
-        # Extract CATs to be provided to the Python Controller later
-        self.ecoACATs = base64.b64decode(jfcStorage.get("Default", "CommissionerCATs"))[::-1].hex().strip('0')
-
-    def teardown_class(self):
-        # Stop all Subprocesses that were started in this test case
-        if self.fabric_a_admin is not None:
-            self.fabric_a_admin.terminate()
-        if self.fabric_a_ctrl is not None:
-            self.fabric_a_ctrl.terminate()
-
-        if self.cert_authority_manager_a is not None:
-            self.cert_authority_manager_a.Shutdown()
-            self.cert_authority_manager_a = None
-
-        super().teardown_class()
-
-    def steps_TC_JFADMIN_2_2(self) -> list[TestStep]:
-        return [
-            TestStep("2", "TH sends ICACCSRRequest command to DUT.",
-                     "DUT response contains status code FAILSAFE_REQUIRED."),
-            TestStep("3", "TH sends ArmFailSafe command to DUT with ExpiryLengthSeconds set to 10 and Breadcrumb 1.",
-                     "DUT respond with ArmFailSafeResponse Command."),
-            TestStep("4", "TH sends ICACCSRRequest command to DUT.",
-                     "DUT response contains an ICACCSR."),
-            TestStep("5", "Wait for ArmFailSafe to expire."),
-            TestStep("6", "TH sends AddICAC command to DUT using icac1 as parameter.",
-                     "DUT response contains status code FAILSAFE_REQUIRED."),
-            TestStep("7", "TH sends ArmFailSafe command to DUT with ExpiryLengthSeconds set to 10 and Breadcrumb 1.",
-                     "DUT respond with ArmFailSafeResponse Command."),
-            # TestStep("8", "[SKIP Missing SDK Implementation] TH sends AddICAC command to DUT using icac1 as parameter.",
-            #          "DUT ICACResponse contains status 2 (InvalidICAC).")
-        ]
-
-    @async_test_body
-    async def test_TC_JFADMIN_2_2(self):
-
-        # Creating a Controller for Ecosystem A
-        _fabric_a_persistent_storage = VolatileTemporaryPersistentStorage(
-            self.ecoACtrlStorage['repl-config'], self.ecoACtrlStorage['sdk-config'])
-        self.cert_authority_manager_a = CertificateAuthority.CertificateAuthorityManager(
-            chipStack=self.matter_stack._chip_stack,
-            persistentStorage=_fabric_a_persistent_storage)
-        self.cert_authority_manager_a.LoadAuthoritiesFromStorage()
-        devCtrlEcoA = self.cert_authority_manager_a.activeCaList[0].adminList[0].NewController(
-            nodeId=101,
-            paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
-            catTags=[int(self.ecoACATs, 16)])
-
-        self.step("2")
-        try:
-            await self.send_single_cmd(
-                dev_ctrl=devCtrlEcoA,
-                node_id=1,
-                endpoint=1,
-                cmd=Clusters.JointFabricAdministrator.Commands.ICACCSRRequest())
-        except InteractionModelError as e:
-            asserts.assert_in('FailsafeRequired (0xca)',
-                              str(e), f'Expected FailsafeRequired error, but got {str(e)}')
-        else:
-            asserts.assert_true(False, 'Expected InteractionModelError with FailsafeRequired, but no exception occurred.')
-
-        self.step("3")
-        await self.send_single_cmd(
-            dev_ctrl=devCtrlEcoA,
-            node_id=1,
-            cmd=Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=10, breadcrumb=1))
-
-        self.step("4")
-        response = await self.send_single_cmd(
-            dev_ctrl=devCtrlEcoA,
-            node_id=1,
-            endpoint=1,
-            cmd=Clusters.JointFabricAdministrator.Commands.ICACCSRRequest())
-        asserts.assert_not_equal(response.icaccsr, b'', "No ICACSR was returned!")
-
-        self.step("5")
-        # Wait for ArmFailSafe timer to expire
-        await asyncio.sleep(11)
-
-        self.step("6")
-        # Get the ICAC from JF-Admin
-        response = await devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(0, Clusters.OperationalCredentials.Attributes.NOCs)],
-            returnClusterObject=True)
-        _icac = response[0][Clusters.OperationalCredentials].NOCs[0].icac
-        cmd = Clusters.JointFabricAdministrator.Commands.AddICAC(_icac)
-        try:
-            await self.send_single_cmd(dev_ctrl=devCtrlEcoA, node_id=1, cmd=cmd, endpoint=1)
-        except InteractionModelError as e:
-            asserts.assert_in('FailsafeRequired (0xca)',
-                              str(e), f'Expected FailsafeRequired error, but got {str(e)}')
-        else:
-            asserts.assert_true(False, 'Expected InteractionModelError with FailsafeRequired, but no exception occurred.')
-
-        self.step("7")
-        await self.send_single_cmd(
-            dev_ctrl=devCtrlEcoA,
-            node_id=1,
-            cmd=Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=60, breadcrumb=1))
-
-        # TODO SDK Functionality is not finished. Uncomment when implementation is ready
-        # self.step("8")
-        # cmd = Clusters.OperationalCredentials.Commands.CSRRequest(CSRNonce=random.randbytes(32), isForUpdateNOC=True)
-        # csr_update = await self.send_single_cmd(dev_ctrl=devCtrlEcoA, node_id=1, cmd=cmd)
-        # new_noc_chain = await devCtrlEcoA.IssueNOCChain(csr_update, 1)
-        # cmd = Clusters.JointFabricAdministrator.Commands.AnnounceJointFabricAdministrator(1)
-        # await self.send_single_cmd(dev_ctrl=devCtrlEcoA, node_id=1, cmd=cmd, endpoint=1)
-        # cmd = Clusters.JointFabricAdministrator.Commands.ICACCSRRequest()
-        # await self.send_single_cmd(dev_ctrl=devCtrlEcoA, node_id=1, cmd=cmd, endpoint=1)
-        # cmd = Clusters.JointFabricAdministrator.Commands.AddICAC(new_noc_chain.icacBytes)
-        # try:
-        #     await self.send_single_cmd(dev_ctrl=devCtrlEcoA, node_id=1, cmd=cmd, endpoint=1)
-        # except InteractionModelError as e:
-        #     asserts.assert_in('InvalidICAC (0x02)',
-        #                       str(e), f'Expected InvalidICAC error, but got {str(e)}')
-        # else:
-        #     asserts.assert_true(False, 'Expected InteractionModelError with InvalidICAC, but no exception occurred.')
-
-        # Shutdown the Python Controllers started at the beginning of this script
-        devCtrlEcoA.Shutdown()
-
-
-if __name__ == "__main__":
-    default_matter_test_main()
diff --git a/src/python_testing/TC_JFDS_2_1.py b/src/python_testing/TC_JFDS_2_1.py
index 4a7c88f1a27..f7181fde8b3 100644
--- a/src/python_testing/TC_JFDS_2_1.py
+++ b/src/python_testing/TC_JFDS_2_1.py
@@ -115,8 +115,7 @@ async def setup_class(self):
 
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
-            message=f"pairing onnetwork-long {self.jfadmin_fabric_a_node_id} {self.jfadmin_fabric_a_passcode} {
-                self.jfadmin_fabric_a_discriminator} --anchor true",
+            message=f"pairing onnetwork-long {self.jfadmin_fabric_a_node_id} {self.jfadmin_fabric_a_passcode} {self.jfadmin_fabric_a_discriminator} --anchor true",
             expected_output=f"[JF] Anchor Administrator (nodeId={self.jfadmin_fabric_a_node_id}) commissioned with success",
             timeout=30)
 
diff --git a/src/python_testing/TC_JFADMIN_2_1.py b/src/python_testing/TC_JFPKI_2_1.py
similarity index 65%
rename from src/python_testing/TC_JFADMIN_2_1.py
rename to src/python_testing/TC_JFPKI_2_1.py
index 6c336d00418..c2f164123bc 100644
--- a/src/python_testing/TC_JFADMIN_2_1.py
+++ b/src/python_testing/TC_JFPKI_2_1.py
@@ -28,6 +28,7 @@
 #       --string-arg jfc_server_app:${JF_CONTROL_APP}
 #       --trace-to json:${TRACE_TEST_JSON}.json
 #       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --PICS src/app/tests/suites/certification/ci-pics-values
 #     factory-reset: true
 #     quiet: true
 # === END CI TEST ARGUMENTS ===
@@ -52,27 +53,27 @@
 log = logging.getLogger(__name__)
 
 
-class TC_JFADMIN_2_1(MatterBaseTest):
+class TC_JFPKI_2_1(MatterBaseTest):
 
     @async_test_body
     async def setup_class(self):
         super().setup_class()
 
         self.fabric_a_ctrl = None
+        self.fabric_a_admin = None
         self.storage_fabric_a = self.user_params.get("fabric_a_storage", None)
-        self.fabric_a_server_app = None
 
-        jfc_server_app = self.user_params.get("jfc_server_app", None)
-        if not jfc_server_app:
+        self.jfc_server_app = self.user_params.get("jfc_server_app", None)
+        if not self.jfc_server_app:
             asserts.fail("This test requires a Joint Fabric Controller app. Specify app path with --string-arg jfc_server_app:<path_to_app>")
-        if not os.path.exists(jfc_server_app):
-            asserts.fail(f"The path {jfc_server_app} does not exist")
+        if not os.path.exists(self.jfc_server_app):
+            asserts.fail(f"The path {self.jfc_server_app} does not exist")
 
-        jfa_server_app = self.user_params.get("jfa_server_app", None)
-        if not jfa_server_app:
+        self.jfa_server_app = self.user_params.get("jfa_server_app", None)
+        if not self.jfa_server_app:
             asserts.fail("This test requires a Joint Fabrics Admin app. Specify app path with --string-arg jfa_server_app:<path_to_app>")
-        if not os.path.exists(jfa_server_app):
-            asserts.fail(f"The path {jfa_server_app} does not exist")
+        if not os.path.exists(self.jfa_server_app):
+            asserts.fail(f"The path {self.jfa_server_app} does not exist")
 
         # Create a temporary storage directory for both ecosystems to keep KVS files if not already provided by user.
         if self.storage_fabric_a is None:
@@ -80,42 +81,62 @@ async def setup_class(self):
             self.storage_fabric_a = self.storage_directory_ecosystem_a.name
             log.info("Temporary storage directory: %s", self.storage_fabric_a)
 
-        #####################################################################################################################################
-        #
-        # Initialize Ecosystem A
-        #
-        #####################################################################################################################################
-        self.jfadmin_fabric_a_passcode = random.randint(110220011, 110220999)
+    def teardown_class(self):
+        # Stop all Subprocesses that were started in this test case
+        if self.fabric_a_admin is not None:
+            self.fabric_a_admin.terminate()
+        if self.fabric_a_ctrl is not None:
+            self.fabric_a_ctrl.terminate()
+
+        super().teardown_class()
+
+    def steps_TC_JFPKI_2_1(self) -> list[TestStep]:
+        return [
+            TestStep("1", "TH starts a commissioning process with DUT.",
+                     "DUT is commissioned by TH with success."),
+            TestStep("2", "TH reads AdministratorFabricIndex attribute from DUT.",
+                     "DUT response contains AdministratorFabricIndex with a value in range 1..254."),
+            TestStep("3", "TH1 reads Fabrics attribute from Operation Cluster on EP0.",
+                     "DUT response contains a FabricDescriptorStruct with FabricID equal to AdministratorFabricIndex from step 2.")
+        ]
+
+    def pics_TC_JFPKI_2_1(self):
+        return ['JFPKI.S']
+
+    @async_test_body
+    async def test_TC_JFPKI_2_1(self):
+        self.step("1")
+        self.JFPKI_fabric_a_passcode = random.randint(110220011, 110220999)
         self.jfctrl_fabric_a_vid = random.randint(0x0001, 0xFFF0)
 
         # Start Fabric A JF-Administrator App
         self.fabric_a_admin = AppServerSubprocess(
-            jfa_server_app,
+            self.jfa_server_app,
             storage_dir=self.storage_fabric_a,
             port=random.randint(5001, 5999),
             discriminator=random.randint(0, 4095),
-            passcode=self.jfadmin_fabric_a_passcode,
+            passcode=self.JFPKI_fabric_a_passcode,
             extra_args=["--capabilities", "0x04", "--rpc-server-port", "33033"])
         self.fabric_a_admin.start(
             expected_output="Server initialization complete",
-            timeout=10)
+            timeout=20)
 
         # Start Fabric A JF-Controller App
         self.fabric_a_ctrl = JFControllerSubprocess(
-            jfc_server_app,
-            "JFC_A",  # Name of the controller instance, used for logging purposes in the JF-Controller app:w
+            self.jfc_server_app,
+            "JFC-A",
             rpc_server_port=33033,
             storage_dir=self.storage_fabric_a,
             vendor_id=self.jfctrl_fabric_a_vid)
         self.fabric_a_ctrl.start(
             expected_output="CHIP task running",
-            timeout=10)
+            timeout=20)
 
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
-            message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
+            message=f"pairing onnetwork 1 {self.JFPKI_fabric_a_passcode} --anchor true",
             expected_output="[JF] Anchor Administrator (nodeId=1) commissioned with success",
-            timeout=10)
+            timeout=20)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -141,27 +162,6 @@ async def setup_class(self):
         # Extract CATs to be provided to the Python Controller later
         self.ecoACATs = base64.b64decode(jfcStorage.get("Default", "CommissionerCATs"))[::-1].hex().strip('0')
 
-    def teardown_class(self):
-        # Stop all Subprocesses that were started in this test case
-        if self.fabric_a_admin is not None:
-            self.fabric_a_admin.terminate()
-        if self.fabric_a_ctrl is not None:
-            self.fabric_a_ctrl.terminate()
-        if self.fabric_a_server_app is not None:
-            self.fabric_a_server_app.terminate()
-
-        super().teardown_class()
-
-    def steps_TC_JFADMIN_2_1(self) -> list[TestStep]:
-        return [
-            TestStep("1", "TH1 read AdministratorFabricIndex attribute.",
-                     "DUT reply contains AdministratorFabricIndex with a value in range 1..254."),
-            TestStep("2", "TH1 read Fabrics attribute from Operation Cluster on EP0.",
-                     "DUT reply FabricDescriptorStruct with FabricID equal to AdministratorFabricIndex from step 1.")
-        ]
-
-    @async_test_body
-    async def test_TC_JFADMIN_2_1(self):
         # Creating a Controller for Ecosystem A
         _fabric_a_persistent_storage = VolatileTemporaryPersistentStorage(
             self.ecoACtrlStorage['repl-config'], self.ecoACtrlStorage['sdk-config'])
@@ -174,22 +174,29 @@ async def test_TC_JFADMIN_2_1(self):
             paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
             catTags=[int(self.ecoACATs, 16)])
 
-        self.step("1")
-        response = await devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(1, Clusters.JointFabricAdministrator.Attributes.AdministratorFabricIndex)],
-            returnClusterObject=True)
-        attributeAdminFabricIndex = response[1][Clusters.JointFabricAdministrator].administratorFabricIndex
-        asserts.assert_greater_equal(attributeAdminFabricIndex, 1,
-                                     "AdministratorFabricIndex is < 1. Expected AdministratorFabricIndex >= 1")
-        asserts.assert_less_equal(attributeAdminFabricIndex, 254,
-                                  "AdministratorFabricIndex is > 254. Expected AdministratorFabricIndex <= 254")
-
-        self.step("2")
-        response = await devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(0, Clusters.OperationalCredentials.Attributes.Fabrics)],
-            returnClusterObject=True)
-        asserts.assert_equal(attributeAdminFabricIndex,
-                             response[0][Clusters.OperationalCredentials].fabrics[0].fabricIndex, "AdministratorFabricIndex != fabricIndex")
+        if self.pics_guard(self.check_pics("JFPKI.S.A0000")):
+            self.step("2")
+            response = await devCtrlEcoA.ReadAttribute(
+                nodeId=1, attributes=[(1, Clusters.JointFabricAdministrator.Attributes.AdministratorFabricIndex)],
+                returnClusterObject=True)
+            attributeAdminFabricIndex = response[1][Clusters.JointFabricAdministrator].administratorFabricIndex
+            asserts.assert_true(attributeAdminFabricIndex in range(1, 255),
+                                f"AdministratorFabricIndex={attributeAdminFabricIndex} not in expected range [1..254]")
+
+            # Step 3 is under same PICS guard as Step 2 becasue it relies on attributeAdminFabricIndex
+            self.step("3")
+            response = await devCtrlEcoA.ReadAttribute(
+                nodeId=1, attributes=[(0, Clusters.OperationalCredentials.Attributes.Fabrics)],
+                returnClusterObject=True)
+            fabricid_found = False
+            for fabric in response[0][Clusters.OperationalCredentials].fabrics:
+                log.info(f"Checking fabricIndex from fabricID={fabric.fabricID}")
+                if fabric.fabricIndex == attributeAdminFabricIndex:
+                    fabricid_found = True
+                    log.info(f"Found matching fabricIndex={attributeAdminFabricIndex} on fabricID={fabric.fabricID}")
+                    break
+            asserts.assert_true(fabricid_found,
+                                "No FabricDescriptorStruct with fabricIndex = AdministratorFabricIndex found in Operational Cluster Fabrics attribute on EP0")
 
         # Shutdown the Python Controllers started at the beginning of this script
         devCtrlEcoA.Shutdown()
diff --git a/src/python_testing/TC_JFPKI_2_2.py b/src/python_testing/TC_JFPKI_2_2.py
new file mode 100644
index 00000000000..1aeb069259b
--- /dev/null
+++ b/src/python_testing/TC_JFPKI_2_2.py
@@ -0,0 +1,399 @@
+#
+#    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.
+#
+
+# This test requires a TH_SERVER application. Please specify with --string-arg th_server_app_path:<path_to_app>
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     script-args: >
+#       --string-arg jfa_server_app:${JF_ADMIN_APP}
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --PICS src/app/tests/suites/certification/ci-pics-values
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+import os
+import random
+import tempfile
+
+from mobly import asserts
+
+import matter.clusters as Clusters
+import matter.discovery as Discovery
+from matter.clusters.Types import NullValue
+from matter.exceptions import ChipStackError
+from matter.interaction_model import InteractionModelError, Status
+from matter.testing.apps import AppServerSubprocess
+from matter.testing.decorators import async_test_body
+from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.runner import TestStep, default_matter_test_main
+from matter.tlv import TLVReader, TLVWriter
+
+log = logging.getLogger(__name__)
+
+
+class TC_JFPKI_2_2(MatterBaseTest):
+    _JOINT_FABRIC_ADMINISTRATOR_ENDPOINT = 1
+    _OPERATIONAL_CREDENTIALS_ENDPOINT = 0
+    _GENERAL_COMMISSIONING_ENDPOINT = 0
+
+    @async_test_body
+    async def setup_class(self):
+        super().setup_class()
+
+        self.fabric_storage = self.user_params.get("fabric_storage", None)
+        self.storage_directory_ecosystem_a = None
+
+        self.jfa_server_app = self.user_params.get("jfa_server_app", None)
+        if not self.jfa_server_app:
+            asserts.fail("This test requires a Joint Fabrics Admin app. Specify app path with --string-arg jfa_server_app:<path_to_app>")
+        if not os.path.exists(self.jfa_server_app):
+            asserts.fail(f"The path {self.jfa_server_app} does not exist")
+
+        # Create a temporary storage directory to keep KVS files if not already provided by user.
+        if self.fabric_storage is None:
+            self.storage_directory_ecosystem_a = tempfile.TemporaryDirectory(prefix=self.__class__.__name__+"_A_")
+            self.fabric_storage = self.storage_directory_ecosystem_a.name
+            log.info("Temporary storage directory: %s", self.fabric_storage)
+
+        self.admin_passcode = random.randint(20202021, 20202099)
+        self.admin_discriminator = random.randint(0, 4095)
+
+        # Start JF-Administrator App
+        self.jf_admin = AppServerSubprocess(
+            self.jfa_server_app,
+            storage_dir=self.fabric_storage,
+            port=random.randint(5001, 5999),
+            discriminator=self.admin_discriminator,
+            passcode=self.admin_passcode,
+            extra_args=["--capabilities", "0x04", "--rpc-server-port", "33033"])
+        self.jf_admin.start(
+            expected_output="Server initialization complete",
+            timeout=10)
+
+    def teardown_class(self):
+        self.jf_admin.terminate()
+        if self.storage_directory_ecosystem_a is not None:
+            self.storage_directory_ecosystem_a.cleanup()
+        super().teardown_class()
+
+    def steps_TC_JFPKI_2_2(self) -> list[TestStep]:
+        return [
+            TestStep("1", "Commission DUT to TH."),
+            TestStep("2", "TH sends ICACCSRRequest command to DUT.",
+                     "DUT response contains status code FAILSAFEREQUIRED."),
+            TestStep("3", "TH sends ArmFailSafe command to DUT with ExpiryLengthSeconds set to 10 and Breadcrumb 1.",
+                     "DUT respond with ArmFailSafeResponse Command."),
+            TestStep("4", "TH sends ICACCSRRequest command to DUT.",
+                     "DUT response contains status code VIDNotVerified."),
+            TestStep("5", "TH sends AddICAC command to DUT using icac1 as parameter.",
+                     "DUT responds with SUCCESS status."),
+            TestStep("6", "TH sends ICACCSRRequest command to DUT.",
+                     "DUT responds with status code CONSTRAINTERROR."),
+            TestStep("7", "Wait for ArmFailSafe to expire."),
+            TestStep("8", "TH sends AddICAC command to DUT using icac1 as parameter.",
+                     "DUT response contains status code FAILSAFEREQUIRED."),
+            TestStep("9", "TH sends ArmFailSafe command to DUT with ExpiryLengthSeconds set to 20 and Breadcrumb 1.",
+                     "DUT respond with ArmFailSafeResponse Command."),
+            TestStep("10", "TH sends AddICAC command to DUT using icac1 as parameter.",
+                     "DUT responds with SUCCESS status."),
+            TestStep("11", "TH sends AddICAC command to DUT using icac1 as parameter.",
+                     "DUT responds with status code CONSTRAINTERROR."),
+            TestStep("12", "Wait for ArmFailSafe to expire."),
+            TestStep("13", "TH sends ArmFailSafe command to DUT with ExpiryLengthSeconds set to 20 and Breadcrumb 1.",
+                     "DUT respond with ArmFailSafeResponse Command."),
+            TestStep("14", "TH sends AddICAC command to DUT using an ICAC that is not associated with the RCAC of TH as parameter.",
+                     "DUT ICACResponse contains status 2 (InvalidICAC)."),
+            TestStep("15", "TH sends AddICAC command to DUT using an ICAC with a different public key than the public key present in ICACCSRResponse",
+                     "DUT ICACResponse contains status 1 (InvalidPublicKey)."),
+            TestStep("16", "TH sends AddICAC command to DUT using a certificate that doesn't follow DN encoding for ICAC",
+                     "DUT ICACResponse contains status 2 (InvalidICAC)."),
+            TestStep("17", "TH sends OJCW command to DUT (check Precondition 1)",
+                     "DUT responds with status code 0x06 (InvalidAdministratorFabricIndex)."),
+        ]
+
+    def desc_TC_JFPKI_2_2(self):
+        return "[TC-JFPKI-2.2] Validate commands behavior outside Joint Commissioning Method"
+
+    def pics_TC_JFPKI_2_2(self):
+        return ['JFPKI.S']
+
+    @async_test_body
+    async def test_TC_JFPKI_2_2(self):
+        self.step("1")
+
+        await self.default_controller.CommissionOnNetwork(
+            nodeId=self.dut_node_id,
+            setupPinCode=self.admin_passcode,
+            filterType=Discovery.FilterType.LONG_DISCRIMINATOR,
+            filter=self.admin_discriminator,
+        )
+        admin_fabric_idx = await self.read_single_attribute_check_success(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cluster=Clusters.JointFabricAdministrator,
+            attribute=Clusters.JointFabricAdministrator.Attributes.AdministratorFabricIndex,
+        )
+        asserts.assert_true(
+            admin_fabric_idx in (None, NullValue, 0),
+            "Precondition failed: AdministratorFabricIndex must be null after commissioning"
+            f" (expected None/NullValue/0, got {admin_fabric_idx!r})",
+        )
+
+        self.step("2")
+        await self._assert_im_error(
+            cmd=Clusters.JointFabricAdministrator.Commands.ICACCSRRequest(),
+            expected_status=Status.FailsafeRequired,
+            error_label="FailsafeRequired",
+        )
+
+        self.step("3")
+        await self._arm_failsafe(10)
+
+        self.step("4")
+        await self._assert_im_error(
+            cmd=Clusters.JointFabricAdministrator.Commands.ICACCSRRequest(),
+            expected_status=Status.Failure,
+            expected_cluster_status=Clusters.JointFabricAdministrator.Enums.StatusCodeEnum.kVIDNotVerified,
+            error_label="VIDNotVerified",
+        )
+
+        self.step("5")
+        response = await self.default_controller.ReadAttribute(
+            nodeId=self.dut_node_id,
+            attributes=[(self._OPERATIONAL_CREDENTIALS_ENDPOINT, Clusters.OperationalCredentials.Attributes.NOCs)],
+            returnClusterObject=True)
+        icac1 = response[0][Clusters.OperationalCredentials].NOCs[0].icac
+        await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(icac1))
+
+        self.step("6")
+        await self._assert_im_error(
+            cmd=Clusters.JointFabricAdministrator.Commands.ICACCSRRequest(),
+            expected_status=Status.ConstraintError,
+            error_label="ConstraintError",
+        )
+
+        self.step("7")
+        await self._expire_failsafe()
+
+        self.step("8")
+        await self._assert_im_error(
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(icac1),
+            expected_status=Status.FailsafeRequired,
+            error_label="FailsafeRequired",
+        )
+
+        self.step("9")
+
+        await self._arm_failsafe(20)
+
+        self.step("10")
+        await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(icac1))
+
+        self.step("11")
+        await self._assert_im_error(
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(icac1),
+            expected_status=Status.ConstraintError,
+            error_label="ConstraintError",
+        )
+
+        self.step("12")
+        await self._expire_failsafe()
+
+        self.step("13")
+        await self._arm_failsafe(20)
+
+        self.step("14")
+
+        # Create a second CA to generate an ICAC that is valid but chained to a different RCAC than the TH controller fabric RCAC.
+        csr_nonce = random.randbytes(32)
+        csr_response = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._OPERATIONAL_CREDENTIALS_ENDPOINT,
+            cmd=Clusters.OperationalCredentials.Commands.CSRRequest(CSRNonce=csr_nonce, isForUpdateNOC=True))
+        other_ca = self.certificate_authority_manager.NewCertificateAuthority()
+        other_admin = other_ca.NewFabricAdmin(vendorId=0xFFF1, fabricId=0x1234)
+        other_ctrl = other_admin.NewController(nodeId=102)
+        other_chain = await other_ctrl.IssueNOCChain(csr_response, self.dut_node_id)
+        asserts.assert_true(other_chain.icacBytes is not None, "Unable to generate ICAC from alternate RCAC")
+        other_icac = other_chain.icacBytes
+
+        resp = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(other_icac))
+        asserts.assert_true(
+            isinstance(resp, Clusters.JointFabricAdministrator.Commands.ICACResponse),
+            f"Unexpected response type: {type(resp)}",
+        )
+        asserts.assert_equal(
+            resp.statusCode,
+            Clusters.JointFabricAdministrator.Enums.ICACResponseStatusEnum.kInvalidICAC,
+            f"Expected InvalidICAC response status, but got {resp.statusCode}",
+        )
+
+        self.step("15")
+        # Reset fail-safe context: AddICAC can only be invoked once per armed fail-safe session.
+        await self._expire_failsafe()
+        await self._arm_failsafe(20)
+
+        # Generate a new ICAC using the old CSR Response, which will have the wrong public key for this fail-safe context.
+        icac_wrong_public_key = await self.default_controller.IssueNOCChain(csr_response, self.dut_node_id)
+
+        # Send AddICAC with the ICAC containing the wrong public key
+        resp = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(icac_wrong_public_key.icacBytes))
+        asserts.assert_true(
+            isinstance(resp, Clusters.JointFabricAdministrator.Commands.ICACResponse),
+            f"Unexpected response type: {type(resp)}",
+        )
+        asserts.assert_equal(
+            resp.statusCode,
+            Clusters.JointFabricAdministrator.Enums.ICACResponseStatusEnum.kInvalidPublicKey,
+            f"Expected InvalidPublicKey response status, but got {resp.statusCode}",
+        )
+
+        self.step("16")
+
+        # Reset fail-safe context: AddICAC can only be invoked once per armed fail-safe session.
+        await self._expire_failsafe()
+        await self._arm_failsafe(20)
+
+        # Create a valid ICAC for the current fail-safe context.
+        csr_nonce = random.randbytes(32)
+        csr_response_step16 = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._OPERATIONAL_CREDENTIALS_ENDPOINT,
+            cmd=Clusters.OperationalCredentials.Commands.CSRRequest(CSRNonce=csr_nonce, isForUpdateNOC=True))
+        valid_icac_chain = await self.default_controller.IssueNOCChain(csr_response_step16, self.dut_node_id)
+
+        # Corrupt Subject DN encoding by changing the Subject container from a DN path to a structure.
+        icac_tlv = TLVReader(valid_icac_chain.icacBytes).get()["Any"]
+        icac_tlv[6] = dict(icac_tlv[6])
+        writer = TLVWriter()
+        writer.put(None, icac_tlv)
+        invalid_dn_icac = bytes(writer.encoding)
+
+        resp = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cmd=Clusters.JointFabricAdministrator.Commands.AddICAC(invalid_dn_icac))
+        asserts.assert_true(
+            isinstance(resp, Clusters.JointFabricAdministrator.Commands.ICACResponse),
+            f"Unexpected response type: {type(resp)}",
+        )
+        asserts.assert_equal(
+            resp.statusCode,
+            Clusters.JointFabricAdministrator.Enums.ICACResponseStatusEnum.kInvalidICAC,
+            f"Expected InvalidICAC response status, but got {resp.statusCode}",
+        )
+
+        self.step("17")
+        # Ensure OJCW does not fail with Busy due to an active fail-safe context from prior steps.
+        await self._expire_failsafe()
+
+        with asserts.assert_raises(ChipStackError) as cm:
+            await self.default_controller.OpenJointCommissioningWindow(
+                nodeId=self.dut_node_id,
+                endpointId=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+                timeout=400,
+                iteration=random.randint(1000, 100000),
+                discriminator=random.randint(0, 4095),
+            )
+        # This is a packed error code, so we get the lowest 8 bits to check the cluster status code
+        cluster_status = cm.exception.err & 0xFF
+        asserts.assert_equal(
+            cluster_status,
+            Clusters.JointFabricAdministrator.Enums.StatusCodeEnum.kInvalidAdministratorFabricIndex,
+            f'Expected InvalidAdministratorFabricIndex status code (0x06), but got 0x{(cluster_status):02x} ({str(cm.exception)})',
+        )
+
+    async def _arm_failsafe(self, expiry_length_seconds):
+        """
+        Sends the ArmFailSafe command to the General Commissioning Cluster of the DUT, with breadcrumb=1 and expiryLengthSeconds
+        passed in as an argument.
+        """
+        resp = await self.send_single_cmd(
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._GENERAL_COMMISSIONING_ENDPOINT,
+            cmd=Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=expiry_length_seconds, breadcrumb=1))
+        asserts.assert_true(
+            isinstance(resp, Clusters.GeneralCommissioning.Commands.ArmFailSafeResponse),
+            f"Unexpected response type: {type(resp)}",
+        )
+        asserts.assert_equal(
+            resp.errorCode,
+            Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kOk,
+            f"ArmFailSafeResponse error code not OK: {resp.errorCode}",
+        )
+
+    async def _expire_failsafe(self):
+        """
+        From the spec on ArmFailSafe (11.10.7.2):
+        > If ExpiryLengthSeconds is 0 and the fail-safe timer was already armed and the accessing fabric matches the Fabric
+        > currently associated with the fail-safe context, then the fail-safe timer SHALL be immediately expired (see further below
+        > for side-effects of expiration).
+        """
+        await self._arm_failsafe(0)
+
+    async def _assert_im_error(self, cmd, expected_status, expected_cluster_status=None, error_label=None):
+        expected_error = error_label if error_label is not None else expected_status
+        with asserts.assert_raises(InteractionModelError, f"Expected InteractionModelError with {expected_error}, but no exception occurred.") as cm:
+            await self.send_single_cmd(
+                dev_ctrl=self.default_controller,
+                node_id=self.dut_node_id,
+                endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+                cmd=cmd)
+        asserts.assert_equal(
+            cm.exception.status,
+            expected_status,
+            f"Expected {expected_status} status, but got {str(cm.exception)}",
+        )
+        if expected_cluster_status is not None:
+            asserts.assert_equal(
+                cm.exception.clusterStatus,
+                expected_cluster_status,
+                f"Expected {expected_cluster_status} cluster status, but got {str(cm.exception)}",
+            )
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_JFPKI_2_4.py b/src/python_testing/TC_JFPKI_2_4.py
new file mode 100644
index 00000000000..9cf1656e646
--- /dev/null
+++ b/src/python_testing/TC_JFPKI_2_4.py
@@ -0,0 +1,444 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+# This test requires a Joint Fabric Administrator app and Joint Fabric Controller app.
+# Please specify with:
+#   --string-arg jfa_server_app:<path_to_app>
+#   --string-arg jfc_server_app:<path_to_app>
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     script-args: >
+#       --string-arg jfa_server_app:${JF_ADMIN_APP}
+#       --string-arg jfc_server_app:${JF_CONTROL_APP}
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --PICS src/app/tests/suites/certification/ci-pics-values
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import asyncio
+import base64
+import logging
+import os
+import random
+import tempfile
+from configparser import ConfigParser
+
+from mobly import asserts
+
+import matter.clusters as Clusters
+import matter.discovery as Discovery
+from matter import CertificateAuthority
+from matter.clusters.Types import NullValue
+from matter.interaction_model import InteractionModelError, Status
+from matter.storage import VolatileTemporaryPersistentStorage
+from matter.testing.apps import JFAdministratorSubprocess, JFControllerSubprocess
+from matter.testing.decorators import async_test_body
+from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.runner import TestStep, default_matter_test_main
+
+log = logging.getLogger(__name__)
+
+
+class TC_JFPKI_2_4(MatterBaseTest):
+    _JOINT_FABRIC_ADMINISTRATOR_ENDPOINT = 1
+    _MIN_COMMISSIONING_TIMEOUT = 60
+    _DEFAULT_OJCW_TIMEOUT = 60
+    # TODO: Seems like the OJCW Discriminator should be randomized, but the test plan explicitly requires this number.
+    _DEFAULT_OJCW_DISCRIMINATOR = 3840
+    _DEFAULT_OJCW_ITERATIONS = 2000
+    _VALID_97_BYTE_VERIFIER = bytes.fromhex(
+        "b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
+    )
+    _VALID_16_BYTE_SALT = b"SPAKE2P Key Salt"
+    _REQUEST_TIMEOUT_MS = 5000
+    _TIMEOUT_STEP_2 = 180
+
+    def desc_TC_JFPKI_2_4(self) -> str:
+        return "[TC-JFPKI-2.4] Validate OpenJointCommissioningWindow Command correct behavior"
+
+    def pics_TC_JFPKI_2_4(self) -> list[str]:
+        return ["JFPKI.S"]
+
+    @property
+    def default_timeout(self) -> int:
+        """
+        We override the test timeout to support steps where we wait for the commissioning timeout to expire.
+        """
+
+        return self._TIMEOUT_STEP_2 + (self._DEFAULT_OJCW_TIMEOUT * 2) + 30
+
+    async def assert_ojcw(
+        self,
+        *,
+        commissioning_timeout=_DEFAULT_OJCW_TIMEOUT,
+        pake_passcode_verifier=_VALID_97_BYTE_VERIFIER,
+        discriminator=_DEFAULT_OJCW_DISCRIMINATOR,
+        iterations=_DEFAULT_OJCW_ITERATIONS,
+        salt=_VALID_16_BYTE_SALT,
+        expected_error_status=None,
+        expected_cluster_status=None,
+        expected_error_message=None,
+    ):
+        cmd = Clusters.JointFabricAdministrator.Commands.OpenJointCommissioningWindow(
+            commissioningTimeout=commissioning_timeout,
+            PAKEPasscodeVerifier=pake_passcode_verifier,
+            discriminator=discriminator,
+            iterations=iterations,
+            salt=salt,
+        )
+
+        if expected_error_status is None:
+            await self.send_single_cmd(
+                cmd=cmd,
+                dev_ctrl=self.dev_ctrl_eco_a,
+                node_id=self.dut_node_id,
+                endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+                timedRequestTimeoutMs=self._REQUEST_TIMEOUT_MS,
+            )
+            return
+
+        assertion_message = expected_error_message or f"Expected {expected_error_status}."
+        with asserts.assert_raises(InteractionModelError, assertion_message) as cm:
+            await self.send_single_cmd(
+                cmd=cmd,
+                dev_ctrl=self.dev_ctrl_eco_a,
+                node_id=self.dut_node_id,
+                endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+                timedRequestTimeoutMs=self._REQUEST_TIMEOUT_MS,
+            )
+        asserts.assert_equal(cm.exception.status, expected_error_status,
+                             f"Expected {expected_error_status}, got {cm.exception.status}")
+        if expected_cluster_status is not None:
+            asserts.assert_equal(cm.exception.clusterStatus, expected_cluster_status,
+                                 f"Expected cluster status {expected_cluster_status}, got {cm.exception.clusterStatus}")
+
+    async def discover_commissionable_nodes(self):
+        return await self.dev_ctrl_eco_a.DiscoverCommissionableNodes(
+            filterType=Discovery.FilterType.LONG_DISCRIMINATOR,
+            filter=self._DEFAULT_OJCW_DISCRIMINATOR,
+            stopOnFirst=True,
+        )
+
+    async def sleep(self, duration_sec):
+        log.info(f"Sleeping for {duration_sec} seconds...")
+        await asyncio.sleep(duration_sec)
+
+    @async_test_body
+    async def setup_class(self):
+        super().setup_class()
+
+        self.fabric_a_ctrl = None
+        self.fabric_a_admin = None
+        self.cert_authority_manager_a = None
+        self.dev_ctrl_eco_a = None
+        self.storage_fabric_a = self.user_params.get("fabric_a_storage", None)
+        self.fabric_a_persistent_storage = None
+
+        self.jfc_server_app = self.user_params.get("jfc_server_app", None)
+        if not self.jfc_server_app:
+            asserts.fail("This test requires a Joint Fabric Controller app. Specify app path with --string-arg jfc_server_app:<path_to_app>")
+        if not os.path.exists(self.jfc_server_app):
+            asserts.fail(f"The path {self.jfc_server_app} does not exist")
+
+        self.jfa_server_app = self.user_params.get("jfa_server_app", None)
+        if not self.jfa_server_app:
+            asserts.fail("This test requires a Joint Fabrics Admin app. Specify app path with --string-arg jfa_server_app:<path_to_app>")
+        if not os.path.exists(self.jfa_server_app):
+            asserts.fail(f"The path {self.jfa_server_app} does not exist")
+
+        # Create a temporary storage directory to keep KVS files if not provided by user.
+        if self.storage_fabric_a is None:
+            self.storage_directory_ecosystem_a = tempfile.mkdtemp(prefix=self.__class__.__name__+"_A_")
+            self.storage_fabric_a = self.storage_directory_ecosystem_a
+            log.info("Temporary storage directory: %s", self.storage_fabric_a)
+
+        self.jfadmin_fabric_a_passcode = random.randint(20202021, 20202099)
+        self.jfadmin_fabric_a_discriminator = random.randint(0, 4095)
+        self.jfctrl_fabric_a_vid = random.randint(0x0001, 0xFFF0)
+
+        self.fabric_a_admin = JFAdministratorSubprocess(
+            self.jfa_server_app,
+            prefix="JFA-A",
+            storage_dir=self.storage_fabric_a,
+            port=random.randint(5001, 5999),
+            discriminator=self.jfadmin_fabric_a_discriminator,
+            passcode=self.jfadmin_fabric_a_passcode,
+            extra_args=["--capabilities", "0x04", "--rpc-server-port", "33033", "--min_commissioning_timeout", f"{self._MIN_COMMISSIONING_TIMEOUT}"])
+        self.fabric_a_admin.start(
+            expected_output="Updating services using commissioning mode 1",
+            timeout=30)
+
+        self.fabric_a_ctrl = JFControllerSubprocess(
+            self.jfc_server_app,
+            prefix="JFC-A",
+            rpc_server_port=33033,
+            storage_dir=self.storage_fabric_a,
+            vendor_id=self.jfctrl_fabric_a_vid)
+        self.fabric_a_ctrl.start(
+            expected_output="CHIP task running",
+            timeout=30)
+
+    def teardown_class(self):
+        if self.fabric_a_persistent_storage is not None:
+            self.fabric_a_persistent_storage.Shutdown()
+        if self.fabric_a_admin is not None:
+            self.fabric_a_admin.terminate()
+        if self.fabric_a_ctrl is not None:
+            self.fabric_a_ctrl.terminate()
+        if self.cert_authority_manager_a is not None:
+            self.cert_authority_manager_a.Shutdown()
+
+        super().teardown_class()
+
+    def steps_TC_JFPKI_2_4(self) -> list[TestStep]:
+        return [
+            TestStep("1", "Commission DUT to TH."),
+            TestStep("2", "TH sends OJCW command to DUT with valid parameters: CommissioningTimeout=180, PAKEPasscodeVerifier=valid_97_byte_verifier, Discriminator=3840, Iterations=2000, Salt=valid_16_byte_salt.",
+                     "DUT responds with SUCCESS status and opens its commissioning window."),
+            TestStep("3", "Verify commissioning window is open by checking DUT advertisement.",
+                     "DUT advertises commissioning service with correct discriminator."),
+            TestStep("4", "Wait for CommissioningTimeout to expire.",
+                     "DUT stops advertising commissioning service."),
+            TestStep("5", "TH sends OJCW command to DUT with CommissioningTimeout=0.",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("6", "TH sends OJCW command to DUT with CommissioningTimeout=65535.",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("7", "TH sends OJCW command to DUT with PAKEPasscodeVerifier of incorrect length (96 bytes).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("8", "TH sends OJCW command to DUT with PAKEPasscodeVerifier of incorrect length (98 bytes).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("9", "TH sends OJCW command to DUT with Discriminator=4096 (out of range).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("10", "TH sends OJCW command to DUT with Iterations=999 (below minimum).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("11", "TH sends OJCW command to DUT with Iterations=100001 (above maximum).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("12", "TH sends OJCW command to DUT with Salt of length 15 bytes (below minimum).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("13", "TH sends OJCW command to DUT with Salt of length 33 bytes (above maximum).",
+                     "DUT responds with INVALID_COMMAND status code."),
+            TestStep("14", "TH sends OJCW command to DUT with valid parameters: CommissioningTimeout=60, Iterations=1000 (minimum valid), Salt=valid_32_byte_salt (maximum valid).",
+                     "DUT responds with SUCCESS status and opens commissioning window."),
+            TestStep("15", "Verify commissioning window behavior with minimum/maximum valid parameters.",
+                     "DUT advertises commissioning service correctly."),
+            TestStep("16", "While commissioning window is open, TH sends another OJCW command.",
+                     "DUT responds with BUSY status code."),
+            TestStep("17", "Wait for commissioning window to close.",
+                     "DUT stops advertising commissioning service."),
+            TestStep("18", "TH sends OJCW command to DUT with Iterations=50000 (mid-range valid), Salt=valid_24_byte_salt (mid-range valid).",
+                     "DUT responds with SUCCESS status and opens commissioning window."),
+            TestStep("19", "Verify commissioning window opens with mid-range parameters.",
+                     "DUT advertises commissioning service correctly."),
+            TestStep("20", "Wait for commissioning window to close.",
+                     "DUT stops advertising commissioning service."),
+        ]
+
+    @async_test_body
+    async def test_TC_JFPKI_2_4(self):
+        self.step("1")
+        self.fabric_a_ctrl.send(
+            message=f"pairing onnetwork-long {self.dut_node_id} {self.jfadmin_fabric_a_passcode} {self.jfadmin_fabric_a_discriminator} --anchor true",
+            expected_output=f"[JF] Anchor Administrator (nodeId={self.dut_node_id}) commissioned with success",
+            timeout=60)
+
+        jfc_storage = ConfigParser()
+        jfc_storage.read(os.path.join(self.storage_fabric_a, 'chip_tool_config.alpha.ini'))
+        self.eco_a_ctrl_storage = {
+            "sdk-config": {
+                "ExampleOpCredsCAKey1": jfc_storage.get("Default", "ExampleOpCredsCAKey0"),
+                "ExampleOpCredsICAKey1": jfc_storage.get("Default", "ExampleOpCredsICAKey0"),
+                "ExampleCARootCert1": jfc_storage.get("Default", "ExampleCARootCert0"),
+                "ExampleCAIntermediateCert1": jfc_storage.get("Default", "ExampleCAIntermediateCert0"),
+            },
+            "repl-config": {
+                "caList": {
+                    "1": [
+                        {
+                            "fabricId": 1,
+                            "vendorId": self.jfctrl_fabric_a_vid
+                        }
+                    ]
+                }
+            }
+        }
+        # Extract CATs to be provided to the Python Controller later
+        self.eco_a_cats = int(base64.b64decode(jfc_storage.get("Default", "CommissionerCATs"))[::-1].hex().strip('0'), 16)
+
+        self.fabric_a_persistent_storage = VolatileTemporaryPersistentStorage(
+            self.eco_a_ctrl_storage['repl-config'], self.eco_a_ctrl_storage['sdk-config'])
+        self.cert_authority_manager_a = CertificateAuthority.CertificateAuthorityManager(
+            chipStack=self.matter_stack._chip_stack,
+            persistentStorage=self.fabric_a_persistent_storage)
+        self.cert_authority_manager_a.LoadAuthoritiesFromStorage()
+        self.dev_ctrl_eco_a = self.cert_authority_manager_a.activeCaList[0].adminList[0].NewController(
+            nodeId=101,
+            paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
+            catTags=[self.eco_a_cats])
+
+        admin_fabric_idx = await self.read_single_attribute_check_success(
+            dev_ctrl=self.dev_ctrl_eco_a,
+            node_id=self.dut_node_id,
+            endpoint=self._JOINT_FABRIC_ADMINISTRATOR_ENDPOINT,
+            cluster=Clusters.JointFabricAdministrator,
+            attribute=Clusters.JointFabricAdministrator.Attributes.AdministratorFabricIndex,
+        )
+        asserts.assert_true(
+            admin_fabric_idx not in (None, NullValue, 0),
+            "Precondition failed: AdministratorFabricIndex must be non-null after commissioning"
+            f" (expected non-null value, got {admin_fabric_idx!r})",
+        )
+        asserts.assert_true(
+            admin_fabric_idx in range(1, 255),
+            f"Precondition failed: AdministratorFabricIndex={admin_fabric_idx!r} not in valid range [1..254]",
+        )
+
+        self.step("2")
+        await self.assert_ojcw(commissioning_timeout=self._TIMEOUT_STEP_2)
+
+        self.step("3")
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_greater_equal(
+            len(responses), 1, "DUT should advertise commissioning service with discriminator 3840"
+        )
+
+        self.step("4")
+        await self.sleep(self._TIMEOUT_STEP_2 + 1)
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_equal(
+            len(responses), 0, "DUT should have stopped advertising commissioning service with discriminator 3840"
+        )
+
+        self.step("5")
+        await self.assert_ojcw(
+            commissioning_timeout=0,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for CommissioningTimeout=0.",
+        )
+
+        self.step("6")
+        await self.assert_ojcw(
+            commissioning_timeout=65535,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for CommissioningTimeout=65535.",
+        )
+
+        self.step("7")
+        invalid_96_byte_verifier = self._VALID_97_BYTE_VERIFIER[:-1]
+        await self.assert_ojcw(
+            pake_passcode_verifier=invalid_96_byte_verifier,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for PAKEPasscodeVerifier length=96.",
+        )
+
+        self.step("8")
+        invalid_98_byte_verifier = self._VALID_97_BYTE_VERIFIER + bytes([0xff])
+        await self.assert_ojcw(
+            pake_passcode_verifier=invalid_98_byte_verifier,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for PAKEPasscodeVerifier length=98.",
+        )
+
+        self.step("9")
+        await self.assert_ojcw(
+            discriminator=4096,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for Discriminator=4096.",
+        )
+
+        self.step("10")
+        await self.assert_ojcw(
+            iterations=999,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for Iterations=999.",
+        )
+
+        self.step("11")
+        await self.assert_ojcw(
+            iterations=100001,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for Iterations=100001.",
+        )
+
+        self.step("12")
+        invalid_15_byte_salt = self._VALID_16_BYTE_SALT[:-1]
+        await self.assert_ojcw(
+            salt=invalid_15_byte_salt,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for Salt length=15.",
+        )
+
+        self.step("13")
+        invalid_33_byte_salt = self._VALID_16_BYTE_SALT + bytes(range(17))
+        await self.assert_ojcw(
+            salt=invalid_33_byte_salt,
+            expected_error_status=Status.InvalidCommand,
+            expected_error_message="Expected INVALID_COMMAND for Salt length=33.",
+        )
+
+        self.step("14")
+        valid_32_byte_salt = self._VALID_16_BYTE_SALT + bytes(range(16))
+        await self.assert_ojcw(iterations=1000, salt=valid_32_byte_salt)
+
+        self.step("15")
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_greater_equal(
+            len(responses), 1, "DUT should advertise commissioning service with discriminator 3840"
+        )
+
+        self.step("16")
+        await self.assert_ojcw(
+            iterations=1000,
+            salt=valid_32_byte_salt,
+            expected_error_status=Status.Failure,
+            expected_cluster_status=Clusters.JointFabricAdministrator.Enums.StatusCodeEnum.kBusy,
+            expected_error_message="Expected BUSY cluster status while commissioning window is already open.",
+        )
+
+        self.step("17")
+        await self.sleep(self._DEFAULT_OJCW_TIMEOUT + 1)
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_equal(
+            len(responses), 0, "DUT should have stopped advertising commissioning service with discriminator 3840"
+        )
+
+        self.step("18")
+        valid_24_byte_salt = self._VALID_16_BYTE_SALT + bytes(range(8))
+        await self.assert_ojcw(iterations=50000, salt=valid_24_byte_salt)
+
+        self.step("19")
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_greater_equal(
+            len(responses), 1, "DUT should advertise commissioning service with discriminator 3840"
+        )
+
+        self.step("20")
+        await self.sleep(self._DEFAULT_OJCW_TIMEOUT + 1)
+        responses = await self.discover_commissionable_nodes()
+        asserts.assert_equal(
+            len(responses), 0, "DUT should have stopped advertising commissioning service with discriminator 3840"
+        )
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_OCC_3_1.py b/src/python_testing/TC_OCC_3_1.py
index d8149f898ca..a7915b968d3 100644
--- a/src/python_testing/TC_OCC_3_1.py
+++ b/src/python_testing/TC_OCC_3_1.py
@@ -49,8 +49,8 @@
 #
 #  There are CI issues to be followed up for the test cases below that implements manually controlling sensor device for
 #  the occupancy state ON/OFF change.
-#  [TC-OCC-3.1] test procedure step 3, 4
-#  [TC-OCC-3.2] test precedure step 3a, 3c
+#  [TC-OCC-3.1] test procedure step 5, 9, 14
+#  [TC-OCC-3.2] test procedure step 3a, 3c
 
 import asyncio
 import logging
@@ -62,7 +62,7 @@
 from matter.interaction_model import Status
 from matter.testing.decorators import async_test_body
 from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler, EventSubscriptionHandler
-from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.matter_testing import AttributeValue, MatterBaseTest
 from matter.testing.runner import TestStep, default_matter_test_main
 
 log = logging.getLogger(__name__)
@@ -93,15 +93,22 @@ def desc_TC_OCC_3_1(self) -> str:
     def steps_TC_OCC_3_1(self) -> list[TestStep]:
         return [
             TestStep(1, "Commission DUT to TH.", is_commissioning=True),
-            TestStep(2, "If HoldTime is supported, TH writes HoldTime attribute to 10 sec on DUT."),
-            TestStep(3, "Prompt operator to await until DUT occupancy changes to unoccupied state."),
-            TestStep(4, "TH subscribes to Occupancy sensor attributes and events."),
-            TestStep("5a", "Prompt operator to trigger occupancy change."),
-            TestStep("5b", "TH reads Occupancy attribute from DUT. Verify occupancy changed to occupied and Occupancy attribute was reported as occupied."),
-            TestStep("5c", "If supported, verify OccupancyChangedEvent was reported as occupied."),
-            TestStep(6, "If HoldTime is supported, wait for HoldTime, otherwise prompt operator to wait until no longer occupied."),
-            TestStep("7a", "TH reads Occupancy attribute from DUT. Verify occupancy changed to unoccupied and Occupancy attribute was reported as unoccupied."),
-            TestStep("7b", "If supported, verify OccupancyChangedEvent was reported as unoccupied."),
+            TestStep(2, "TH reads AttributeList attribute."),
+            TestStep(3, "If HoldTime attribute is supported, TH writes HoldTime attribute to 10 sec on DUT."),
+            TestStep(4, "If HoldTime attribute is supported, TH reads HoldTime attribute."),
+            TestStep(5, "Prompt operator to await until DUT occupancy is in unoccupied state and confirm before moving on."),
+            TestStep(6, "TH reads Occupancy attribute."),
+            TestStep(7, "Set up a wildcard subscription for attributes and events of the Occupancy Sensing Cluster."),
+            TestStep(8, "Start accumulating all attribute and event reports on the subscription."),
+            TestStep(9, "Prompt operator to trigger occupancy change to occupied."),
+            TestStep(10, "TH reads Occupancy attribute."),
+            TestStep(11, "Wait for up to 30 seconds for TH to have received an attribute data report."),
+            TestStep(12, "If OCCEVENT feature is supported or OCC.S.E00(OccupancyChanged) is set, TH waits for event data report."),
+            TestStep(13, "TH clears the accumulated subscription reports and restarts accumulating."),
+            TestStep(14, "Prompt operator to ensure sensor no longer detects occupancy. Wait for HoldTime duration if supported."),
+            TestStep(15, "TH reads Occupancy attribute."),
+            TestStep(16, "Wait for up to 30 seconds for TH to have received an attribute data report."),
+            TestStep(17, "If OCCEVENT feature is supported or OCC.S.E00(OccupancyChanged) is set, TH waits for event data report."),
         ]
 
     def pics_TC_OCC_3_1(self) -> list[str]:
@@ -111,104 +118,150 @@ def pics_TC_OCC_3_1(self) -> list[str]:
 
     @async_test_body
     async def test_TC_OCC_3_1(self):
-        hold_time = 10 if not self.is_ci else 1.0  # 10 seconds for occupancy state hold time
+        hold_time = 10 if not self.is_ci else 1  # 10 seconds for occupancy state hold time
+        endpoint_id = self.get_endpoint()
+        node_id = self.dut_node_id
+        dev_ctrl = self.default_controller
+
         self.step(1)  # Commissioning already done
 
         self.step(2)
-
         cluster = Clusters.OccupancySensing
         attributes = cluster.Attributes
         attribute_list = await self.read_occ_attribute_expect_success(attribute=attributes.AttributeList)
 
         has_hold_time = attributes.HoldTime.attribute_id in attribute_list
-        occupancy_event_supported = self.check_pics("OCC.M.OccupancyChange") or self.is_ci
 
+        # Check for OCCEVENT feature (F09) or OCC.S.E00(OccupancyChanged) PICS
+        feature_map = await self.read_occ_attribute_expect_success(attribute=attributes.FeatureMap)
+
+        # OCCEVENT (F09) requires cluster Rev >= v7
+        try:
+            has_occevent_feature = (feature_map & cluster.Bitmaps.Feature.kOccupancyEventReporting) != 0
+        except AttributeError:
+            has_occevent_feature = False
+
+        occupancy_event_supported = has_occevent_feature or self.check_pics("OCC.S.E00")
+
+        log.info(f"Feature map: 0x{feature_map:x}, OCCEVENT feature: {has_occevent_feature}")
+        log.info(f"HoldTime supported: {has_hold_time}, OccupancyChanged event supported: {occupancy_event_supported}")
+
+        self.step(3)
         if has_hold_time:
-            # write HoldTimeLimits HoldtimeMin to be 10 sec.
+            # Write HoldTime attribute to 10 sec
             await self.write_single_attribute(cluster.Attributes.HoldTime(hold_time))
-            holdtime_dut = await self.read_occ_attribute_expect_success(attribute=attributes.HoldTime)
-            asserts.assert_equal(holdtime_dut, hold_time, "Hold time read-back does not match hold time written")
         else:
-            log.info("No HoldTime attribute supports. Will test only occupancy attribute triggering functionality only.")
+            log.info("HoldTime attribute not supported. Skipping step 3.")
+            self.mark_current_step_skipped()
 
-        self.step(3)
+        self.step(4)
+        if has_hold_time:
+            holdtime_dut = await self.read_occ_attribute_expect_success(attribute=attributes.HoldTime)
+            asserts.assert_equal(holdtime_dut, hold_time, f"HoldTime read-back does not match the written value of {hold_time}")
+        else:
+            log.info("HoldTime attribute not supported. Skipping step 4.")
+            self.mark_current_step_skipped()
 
+        self.step(5)
         if self.is_ci:
             # CI call to trigger unoccupied.
-            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": 1, "Occupancy": 0})
+            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": endpoint_id, "Occupancy": 0})
         else:
             self.wait_for_user_input(
-                prompt_msg="Type any letter and press ENTER after the sensor occupancy is unoccupied state (occupancy attribute = 0)")
+                prompt_msg="Type any letter and press ENTER after the sensor occupancy is in unoccupied state (occupancy attribute = 0)")
 
-        # check sensor occupancy state is 0 for the next test step
+        self.step(6)
+        # Read and verify Occupancy = 0 (Unoccupied)
         occupancy_dut = await self.read_occ_attribute_expect_success(attribute=attributes.Occupancy)
-        asserts.assert_equal(occupancy_dut, 0, "Occupancy attribute is not unoccupied.")
+        asserts.assert_equal(occupancy_dut, 0, "Occupancy attribute is not 0 (Unoccupied).")
 
-        self.step(4)
-        # Setup Occupancy attribute subscription here
-        endpoint_id = self.get_endpoint()
-        node_id = self.dut_node_id
-        dev_ctrl = self.default_controller
+        self.step(7)
+        # Set up wildcard subscription for attributes and events
+        # MinIntervalFloor = 0, MaxIntervalCeiling = 30, KeepSubscriptions = false (EventSubscriptionHandler has True hardcoded and can't be changed)
         attrib_listener = AttributeSubscriptionHandler(expected_cluster=cluster)
-        await attrib_listener.start(dev_ctrl, node_id, endpoint=endpoint_id, min_interval_sec=0, max_interval_sec=30)
+        await attrib_listener.start(dev_ctrl, node_id, endpoint=endpoint_id, min_interval_sec=0, max_interval_sec=30, keepSubscriptions=False)
 
         if occupancy_event_supported:
             event_listener = EventSubscriptionHandler(expected_cluster=cluster)
             await event_listener.start(dev_ctrl, node_id, endpoint=endpoint_id, min_interval_sec=0, max_interval_sec=30)
 
-        self.step("5a")
-        # CI call to trigger on
+        self.step(8)
+        # Start accumulating all attribute and event reports on the subscription
+        # (Already being done by the subscription handlers)
+        log.info("Subscription established. Accumulating attribute and event reports.")
+
+        self.step(9)
+        # Prompt operator to trigger occupancy change to occupied
         if self.is_ci:
-            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": 1, "Occupancy": 1})
+            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": endpoint_id, "Occupancy": 1})
         else:
-            # Trigger occupancy sensor to change Occupancy attribute value to 1 => TESTER ACTION on DUT
-            self.wait_for_user_input(prompt_msg="Type any letter and press ENTER after a sensor occupancy is triggered.")
+            self.wait_for_user_input(prompt_msg="Type any letter and press ENTER after triggering occupancy to occupied.")
 
-        # And then check if Occupancy attribute has changed.
-        self.step("5b")
+        self.step(10)
+        # TH reads Occupancy attribute - verify received value is 1 (Occupied)
         occupancy_dut = await self.read_occ_attribute_expect_success(attribute=attributes.Occupancy)
-        asserts.assert_equal(occupancy_dut, 1, "Occupancy state is not changed to 1")
+        asserts.assert_equal(occupancy_dut, 1, "Occupancy attribute is not 1 (Occupied).")
 
-        # subscription verification
-        post_prompt_settle_delay_seconds = 1.0 if self.is_ci else 10.0
-        attrib_listener.await_sequence_of_reports(attribute=cluster.Attributes.Occupancy, sequence=[
-                                                  1], timeout_sec=post_prompt_settle_delay_seconds)
+        self.step(11)
+        # Wait for up to 30 seconds for attribute data report with Occupancy = 1
+        attrib_listener.await_all_final_values_reported(
+            expected_final_values=[AttributeValue(endpoint_id=endpoint_id,
+                                                  attribute=cluster.Attributes.Occupancy, value=1)],
+            timeout_sec=30.0)
+        log.info("Received attribute report for Occupancy = 1 (Occupied).")
 
+        self.step(12)
         if occupancy_event_supported:
-            self.step("5c")
-            event = event_listener.wait_for_event_report(
-                cluster.Events.OccupancyChanged, timeout_sec=post_prompt_settle_delay_seconds)
-            asserts.assert_equal(event.occupancy, 1, "Unexpected occupancy on OccupancyChanged")
+            # Wait for OccupancyChanged event with Occupancy = 1
+            event = event_listener.wait_for_event_report(cluster.Events.OccupancyChanged, timeout_sec=30.0)
+            asserts.assert_equal(event.occupancy, 1, "OccupancyChanged event did not report Occupancy = 1 (Occupied)")
+            log.info("Received OccupancyChanged event with Occupancy = 1 (Occupied).")
         else:
-            self.skip_step("5c")
+            log.info("OccupancyChanged event not supported. Skipping step 12.")
+            self.mark_current_step_skipped()
 
-        self.step(6)
+        self.step(13)
+        # Clear accumulated reports and restart accumulating
+        attrib_listener.reset()
+        if occupancy_event_supported:
+            event_listener.reset()
+        log.info("Cleared accumulated reports. Restarting accumulation.")
+
+        self.step(14)
+        # Prompt operator to ensure sensor no longer detects occupancy. Wait for HoldTime duration if supported
         if self.is_ci:
             # CI call to trigger unoccupied.
-            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": 1, "Occupancy": 0})
-
-        if has_hold_time:
-            await asyncio.sleep(hold_time + 2.0)  # add some extra 2 seconds to ensure hold time has passed.
+            self.write_to_app_pipe({"Name": "SetOccupancy", "EndpointId": endpoint_id, "Occupancy": 0})
         else:
             self.wait_for_user_input(
-                prompt_msg="Type any letter and press ENTER after the sensor occupancy is back to unoccupied state (occupancy attribute = 0)")
+                prompt_msg="Ensure the sensor no longer detects occupancy, then press ENTER")
+
+        if has_hold_time:
+            log.info(f"Waiting for HoldTime duration ({hold_time} seconds) plus buffer...")
+            await asyncio.sleep(hold_time + 2.0)  # add extra 2 seconds buffer
 
-        # Check if Occupancy attribute is back to 0 after HoldTime attribute period
-        # Tester should not be triggering the sensor for this test step.
-        self.step("7a")
+        self.step(15)
+        # TH reads Occupancy attribute - verify received value is 0 (Unoccupied)
         occupancy_dut = await self.read_occ_attribute_expect_success(attribute=attributes.Occupancy)
-        asserts.assert_equal(occupancy_dut, 0, "Occupancy state is not back to 0 after HoldTime period")
+        asserts.assert_equal(occupancy_dut, 0, "Occupancy attribute is not 0 (Unoccupied) after HoldTime period.")
 
-        attrib_listener.await_sequence_of_reports(attribute=cluster.Attributes.Occupancy, sequence=[
-            0], timeout_sec=post_prompt_settle_delay_seconds)
+        self.step(16)
+        # Wait for up to 30 seconds for attribute data report with Occupancy = 0
+        attrib_listener.await_all_final_values_reported(
+            expected_final_values=[AttributeValue(endpoint_id=endpoint_id,
+                                                  attribute=cluster.Attributes.Occupancy, value=0)],
+            timeout_sec=30.0)
+        log.info("Received attribute report for Occupancy = 0 (Unoccupied).")
 
+        self.step(17)
         if occupancy_event_supported:
-            self.step("7b")
-            event = event_listener.wait_for_event_report(
-                cluster.Events.OccupancyChanged, timeout_sec=post_prompt_settle_delay_seconds)
-            asserts.assert_equal(event.occupancy, 0, "Unexpected occupancy on OccupancyChanged")
+            # Wait for OccupancyChanged event with Occupancy = 0
+            event = event_listener.wait_for_event_report(cluster.Events.OccupancyChanged, timeout_sec=30.0)
+            asserts.assert_equal(event.occupancy, 0, "OccupancyChanged event did not report Occupancy = 0 (Unoccupied)")
+            log.info("Received OccupancyChanged event with Occupancy = 0 (Unoccupied).")
         else:
-            self.skip_step("7b")
+            log.info("OccupancyChanged event not supported. Skipping step 17.")
+            self.mark_current_step_skipped()
 
 
 if __name__ == "__main__":
diff --git a/src/python_testing/TC_OPCREDS_3_1.py b/src/python_testing/TC_OPCREDS_3_1.py
index 97d9096ca25..504b16271ab 100644
--- a/src/python_testing/TC_OPCREDS_3_1.py
+++ b/src/python_testing/TC_OPCREDS_3_1.py
@@ -616,31 +616,100 @@ async def test_TC_OPCREDS_3_1(self):
         asserts.assert_equal(resp.errorCode, Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kOk,
                              "Failure status returned from arm failsafe")
 
-        self.print_step(72, "TH2 reads its fabric index from the CurrentFabricIndex attribute and saves as FabricIndex_TH2")
+        self.print_step(
+            72, "Create a new CA and Fabric configured to generate a certificate chain without an ICAC, then establish PASE to this Fabric.")
+        TH3_CA = self.certificate_authority_manager.NewCertificateAuthority()
+        TH3_CA.alwaysOmitIcac = True
+
+        TH3_vid = 0xFFF4
+        TH3_fabricId = 4
+        TH3_nodeid = self.default_controller.nodeId + 10
+        TH3_dut_nodeid = self.dut_node_id + 10
+        TH3_fabric_admin = TH3_CA.NewFabricAdmin(vendorId=TH3_vid, fabricId=TH3_fabricId)
+        TH3 = TH3_fabric_admin.NewController(nodeId=TH3_nodeid)
+
+        resp = await self.open_commissioning_window()
+        await TH3.FindOrEstablishPASESession(setupCode=resp.commissioningParameters.setupQRCode, nodeId=TH3_dut_nodeid, timeoutMs=60000)
+
+        self.print_step(73, "TH3 sends ArmFailSafe command to the DUT with the ExpiryLengthSeconds field set to failsafe_max| Verify that the DUT sends ArmFailSafeResponse Command to TH3 with field ErrorCode as 'OK'(0)")
+        cmd = Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=failsafe_max, breadcrumb=0)
+        resp = await self.send_single_cmd(dev_ctrl=TH3, node_id=TH3_dut_nodeid, cmd=cmd)
+        asserts.assert_equal(resp.errorCode, Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kOk,
+                             "Failure status returned from arm failsafe")
+
+        self.print_step(74, "TH3 Sends CSRRequest command with a random 32-byte nonce and saves the response as `csrResponseNoIcac`")
+        nonce = random.randbytes(32)
+        csrResponseNoIcac = await self.send_single_cmd(dev_ctrl=TH3, node_id=TH3_dut_nodeid, cmd=opcreds.Commands.CSRRequest(CSRNonce=nonce, isForUpdateNOC=False))
+
+        self.print_step(75, "TH3 generates a new RCAC and NOC but Omits ICAC in the Certificate Chain")
+        # Save RCAC as `Root_CA_Certificate_TH3`
+        # Save NOC as `Node_Operational_Certificate_TH3`
+        TH3_certs = await TH3.IssueNOCChain(csrResponseNoIcac, TH3_dut_nodeid)
+        asserts.assert_is_none(TH3_certs.icacBytes,
+                               "IssueNOCChain returned an ICAC, but Step 75 requires omitting the ICAC from the certificate chain")
+        if (TH3_certs.rcacBytes is None or TH3_certs.nocBytes is None or TH3_certs.ipkBytes is None):
+            # Expiring the failsafe timer in an attempt to clean up.
+            await TH3.SendCommand(TH3_dut_nodeid, 0, Clusters.GeneralCommissioning.Commands.ArmFailSafe(0))
+            asserts.fail("Unable to generate NOC chain for DUT - this is a script failure, please report this as a bug")
+
+        self.print_step(76, "TH3 sends the AddTrustedRootCert command using the certs generated in step 75")
+        cmd = opcreds.Commands.AddTrustedRootCertificate(TH3_certs.rcacBytes)
+        await self.send_single_cmd(cmd=cmd, dev_ctrl=TH3, node_id=TH3_dut_nodeid)
+
+        self.print_step(77, "TH3 sends the AddNOC Command to DUT using the certs generated in step 75. The RCAC is re-used and presented as an ICAC | Verify that DUT responds with status code InvalidNOC")
+        # NOCValue as `Node_Operational_Certificate_TH3`
+        # ICACValue as `Root_CA_Certificate_TH3`
+        # CaseAdminSubject as the NodeID of TH3
+        # AdminVendorId as the Vendor ID of TH3
+        cmd = opcreds.Commands.AddNOC(NOCValue=TH3_certs.nocBytes, ICACValue=TH3_certs.rcacBytes,
+                                      IPKValue=TH3_certs.ipkBytes, caseAdminSubject=TH3_nodeid, adminVendorId=TH3_vid)
+        resp = await self.send_single_cmd(dev_ctrl=TH3, node_id=TH3_dut_nodeid, cmd=cmd)
+        asserts.assert_equal(
+            resp.statusCode, opcreds.Enums.NodeOperationalCertStatusEnum.kInvalidNOC, "Failure when adding NOC")
+
+        self.print_step(
+            78, "TH3 sends the AddNOC Command to DUT using the certs generated in step 75. This time, the ICAC is omitted | Verify that DUT responds with status code OK")
+        # NOCValue as `Node_Operational_Certificate_TH3`
+        # ICACValue as `None`
+        # CaseAdminSubject as the NodeID of TH3
+        # AdminVendorId as the Vendor ID of TH3
+        cmd = opcreds.Commands.AddNOC(NOCValue=TH3_certs.nocBytes, ICACValue=None,
+                                      IPKValue=TH3_certs.ipkBytes, caseAdminSubject=TH3_nodeid, adminVendorId=TH3_vid)
+        resp = await self.send_single_cmd(dev_ctrl=TH3, node_id=TH3_dut_nodeid, cmd=cmd)
+        asserts.assert_equal(
+            resp.statusCode, opcreds.Enums.NodeOperationalCertStatusEnum.kOk, "Failure when adding NOC")
+
+        self.print_step(79, "TH3 sends ArmFailSafe command to the DUT with ExpiryLengthSeconds set to 0| Verify that the DUT sends ArmFailSafeResponse Command to TH3 with field ErrorCode as 'OK'(0)")
+        cmd = Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0)
+        resp = await self.send_single_cmd(dev_ctrl=TH3, node_id=TH3_dut_nodeid, cmd=cmd)
+        asserts.assert_equal(resp.errorCode, Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kOk,
+                             "Failure status returned from arm failsafe")
+
+        self.print_step(80, "TH2 reads its fabric index from the CurrentFabricIndex attribute and saves as FabricIndex_TH2")
         fabric_index_th2 = await self.read_single_attribute_check_success(
             cluster=opcreds, attribute=opcreds.Attributes.CurrentFabricIndex, dev_ctrl=TH2, node_id=TH2_dut_nodeid)
 
-        self.print_step(73, "TH2 sends RemoveFabric command with Fabric Index as FabricIndexTH2 + 5 (Invalid Fabric Index) to DUT | Verify that DUT sends NOCResponse Command with StatusCode of InvalidFabricIndex")
+        self.print_step(81, "TH2 sends RemoveFabric command with Fabric Index as FabricIndexTH2 + 5 (Invalid Fabric Index) to DUT | Verify that DUT sends NOCResponse Command with StatusCode of InvalidFabricIndex")
         cmd = opcreds.Commands.RemoveFabric(fabric_index_th2 + 5)
         resp = await self.send_single_cmd(dev_ctrl=TH2, node_id=TH2_dut_nodeid, cmd=cmd)
         asserts.assert_equal(resp.statusCode, opcreds.Enums.NodeOperationalCertStatusEnum.kInvalidFabricIndex)
 
-        self.print_step(74, "TH2 reads the Fabrics List from DUT using a non-fabric-filtered read")
+        self.print_step(82, "TH2 reads the Fabrics List from DUT using a non-fabric-filtered read")
         resp = await self.read_single_attribute_check_success(cluster=opcreds, attribute=opcreds.Attributes.Fabrics, dev_ctrl=TH2, node_id=TH2_dut_nodeid, fabric_filtered=False)
         asserts.assert_equal(len(resp), fabrics_original_size + 2, "Unexpected number of fabrics on device")
 
-        self.print_step(75, "TH1 reads its fabric index from the CurrentFabricIndex attribute and saves as FabricIndex_TH1")
+        self.print_step(83, "TH1 reads its fabric index from the CurrentFabricIndex attribute and saves as FabricIndex_TH1")
         fabric_index_th1 = await self.read_single_attribute_check_success(
             cluster=opcreds, attribute=opcreds.Attributes.CurrentFabricIndex, dev_ctrl=TH1, node_id=newNodeId)
 
         self.print_step(
-            76, "TH0 sends RemoveFabric command with Fabric Index as FabricIndex_TH1")
+            84, "TH0 sends RemoveFabric command with Fabric Index as FabricIndex_TH1")
         cmd = opcreds.Commands.RemoveFabric(fabric_index_th1)
         resp = await self.send_single_cmd(cmd=cmd)
         asserts.assert_equal(resp.statusCode, opcreds.Enums.NodeOperationalCertStatusEnum.kOk)
 
         self.print_step(
-            77, "TH0 sends RemoveFabric command with Fabric Index as FabricIndex_TH2")
+            85, "TH0 sends RemoveFabric command with Fabric Index as FabricIndex_TH2")
         cmd = opcreds.Commands.RemoveFabric(fabric_index_th2)
         resp = await self.send_single_cmd(cmd=cmd)
         asserts.assert_equal(resp.statusCode, opcreds.Enums.NodeOperationalCertStatusEnum.kOk)
diff --git a/src/python_testing/TC_SMOKECO_2_7.py b/src/python_testing/TC_SMOKECO_2_7.py
new file mode 100644
index 00000000000..48b1339052c
--- /dev/null
+++ b/src/python_testing/TC_SMOKECO_2_7.py
@@ -0,0 +1,180 @@
+#
+#    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.
+#
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_CLUSTERS_APP}
+#     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json --app-pipe /tmp/smokeco_2_7_fifo
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 1234
+#       --passcode 20202021
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --endpoint 1
+#       --app-pipe /tmp/smokeco_2_7_fifo
+#       --bool-arg simulate_mounting:true
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+#
+
+import logging
+
+from mobly import asserts
+
+import matter.clusters as Clusters
+from matter.testing.decorators import async_test_body
+from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler
+from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.runner import TestStep, default_matter_test_main
+
+log = logging.getLogger(__name__)
+
+
+class TC_SMOKECO_2_7(MatterBaseTest):
+    def setup_test(self):
+        super().setup_test()
+        self.is_ci = self.matter_test_config.global_test_params.get('simulate_mounting', False)
+
+    async def read_smokeco_attribute_expect_success(self, attribute):
+        cluster = Clusters.Objects.SmokeCoAlarm
+        endpoint = self.get_endpoint()
+        return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute)
+
+    def desc_TC_SMOKECO_2_7(self) -> str:
+        return "[TC-SMOKECO-2.7] Unmount Attribute with DUT as Server"
+
+    def steps_TC_SMOKECO_2_7(self) -> list[TestStep]:
+        return [
+            TestStep(1, "Commission DUT to TH.", is_commissioning=True),
+            TestStep(2, "TH reads from the DUT the BatteryAlert attribute."),
+            TestStep(3, "TH reads from the DUT the HardwareFaultAlert attribute."),
+            TestStep(4, "TH subscribes to Unmounted attribute with  min interval 0s and max interval 30s."),
+            TestStep(5, "TH reads from the DUT the ExpressedState attribute."),
+            TestStep(6, "TH prompts operator to unmount the device."),
+            TestStep(7, "TH waits for a report of Unmounted attribute from DUT with a timeout of 60 seconds."),
+            TestStep(8, "TH reads ExpressedState attribute from DUT."),
+            TestStep(9, "TH prompts operator to mount the device."),
+            TestStep(10, "TH waits for a report of Unmounted attribute from DUT with a timeout of 60 seconds."),
+            TestStep(11, "TH reads ExpressedState attribute from DUT."),
+        ]
+
+    def pics_TC_SMOKECO_2_7(self) -> list[str]:
+        return [
+            "SMOKECO.S.A000d",
+        ]
+
+    @async_test_body
+    async def test_TC_SMOKECO_2_7(self):
+        cluster = Clusters.SmokeCoAlarm
+        attributes = cluster.Attributes
+        attribute_list = await self.read_smokeco_attribute_expect_success(attribute=attributes.AttributeList)
+        endpoint = self.get_endpoint()
+
+        has_battery_alert = attributes.BatteryAlert.attribute_id in attribute_list
+        has_hardware_fault_alert = attributes.HardwareFaultAlert.attribute_id in attribute_list
+        has_unmounted = attributes.Unmounted.attribute_id in attribute_list
+        has_expressed_state = attributes.ExpressedState.attribute_id in attribute_list
+        inoperative_when_unmounted_supported = self.check_pics("SMOKECO.M.InoperativeWhenUnmounted") or self.is_ci
+
+        # Step 1, "Commission DUT to TH."
+        self.step(1)  # Commissioning already done
+
+        # Step 2, "TH reads from the DUT the BatteryAlert attribute."
+
+        self.step(2)
+        if has_battery_alert:
+            battery_alert_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.BatteryAlert)
+            asserts.assert_not_equal(battery_alert_dut, 2, "Battery Alert should not be critical (2)")
+
+        # Step 3, "TH reads from the DUT the HardwareFaultAlert attribute."
+        self.step(3)
+        if has_hardware_fault_alert:
+            hardware_fault_alert_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.HardwareFaultAlert)
+            asserts.assert_equal(hardware_fault_alert_dut, 0, "No hardware fault expected")
+
+        # Step 4, "TH subscribes to Unmounted attribute with  min interval 0s and max interval 30s."
+        self.step(4)
+        if has_unmounted:
+            sub_handler = AttributeSubscriptionHandler(expected_cluster=cluster, expected_attribute=attributes.Unmounted)
+            await sub_handler.start(self.default_controller, self.dut_node_id, endpoint, max_interval_sec=30)
+
+            unmounted_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.Unmounted)
+            asserts.assert_equal(unmounted_dut, 0, "Expect not unmounted")
+
+        # Step 5, "TH reads from the DUT the ExpressedState attribute."
+        self.step(5)
+        if has_expressed_state:
+            expressed_state_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.ExpressedState)
+            asserts.assert_not_equal(expressed_state_dut, 9, "ExpressedState should not be Inoperative")
+
+        # Step 6, "TH prompts operator to unmount the device."
+        self.step(6)
+
+        if has_unmounted:
+            if self.is_ci:
+                # CI call to trigger unmounted.
+                self.write_to_app_pipe({"Name": "SetUnmounted", "EndpointId": endpoint, "Unmounted": 1})
+            else:
+                self.wait_for_user_input(
+                    prompt_msg="Unmount DUT and press enter")
+
+        # Step 7, "TH waits for a report of Unmounted attribute from DUT with a timeout of 60 seconds."
+        self.step(7)
+        if has_unmounted:
+            sub_handler.wait_for_attribute_report(timeout_sec=60)
+            asserts.assert_equal(sub_handler.attribute_reports[cluster.Attributes.Unmounted]
+                                 [0].value, 1, msg="Received unexpected value for Unmounted")
+            sub_handler.reset()
+
+        # Step 8, "TH reads ExpressedState attribute from DUT."
+        self.step(8)
+        if has_expressed_state and has_unmounted and inoperative_when_unmounted_supported:
+            expressed_state_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.ExpressedState)
+            asserts.assert_equal(expressed_state_dut, 9, "ExpressedState should be Inoperative")
+
+        # Step 9, "TH prompts operator to mount the device."
+        self.step(9)
+        if has_unmounted:
+            if self.is_ci:
+                # CI call to trigger mounted.
+                self.write_to_app_pipe({"Name": "SetUnmounted", "EndpointId": endpoint, "Unmounted": 0})
+            else:
+                self.wait_for_user_input(
+                    prompt_msg="Mount DUT and press enter")
+
+        # Step 10, "TH waits for a report of Unmounted attribute from DUT with a timeout of 60 seconds."
+        self.step(10)
+        if has_unmounted:
+            sub_handler.wait_for_attribute_report(timeout_sec=60)
+            asserts.assert_equal(sub_handler.attribute_reports[cluster.Attributes.Unmounted]
+                                 [0].value, 0, msg="Received unexpected value for Unmounted")
+
+        # Step 11, "TH reads ExpressedState attribute from DUT."
+        self.step(11)
+        if has_expressed_state and has_unmounted and inoperative_when_unmounted_supported:
+            expressed_state_dut = await self.read_smokeco_attribute_expect_success(attribute=attributes.ExpressedState)
+            asserts.assert_not_equal(expressed_state_dut, 9, "ExpressedState should not be Inoperative")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_SUTestBase.py b/src/python_testing/TC_SUTestBase.py
index 26845b3d984..d7f7a345e97 100644
--- a/src/python_testing/TC_SUTestBase.py
+++ b/src/python_testing/TC_SUTestBase.py
@@ -348,7 +348,6 @@ def restart_requestor(self, restore: bool = False):
     async def clear_ota_providers(self, controller: ChipDeviceCtrl, requestor_node_id: int):
         """
         Clears the DefaultOTAProviders attribute on the Requestor, leaving it empty.
-
         Args:
             controller (ChipDeviceCtrl): The controller to use for writing attributes.
             requestor_node_id (int): Node ID of the Requestor device.
diff --git a/src/python_testing/TC_SU_2_5.py b/src/python_testing/TC_SU_2_5.py
new file mode 100644
index 00000000000..02cc73b095b
--- /dev/null
+++ b/src/python_testing/TC_SU_2_5.py
@@ -0,0 +1,539 @@
+#
+#    Copyright (c) 2025 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.
+#
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+#
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${OTA_REQUESTOR_APP}
+#     app-args: >
+#       --discriminator 123
+#       --passcode 2123
+#       --KVS /tmp/chip_kvs_requestor
+#       --autoApplyImage
+#       --trace-to json:${TRACE_APP}.json
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 123
+#       --passcode 2123
+#       --endpoint 0
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#       --PICS src/app/tests/suites/certification/ci-pics-values
+#       --string-arg provider_app_path:${OTA_PROVIDER_APP}
+#       --string-arg ota_image:${SU_OTA_REQUESTOR_V2}
+#       --int-arg ota_image_expected_version:2
+#       --int-arg ota_provider_port:5541
+#       --int-arg ota_image_download_timeout:300
+#       --timeout 2100
+#     factory-reset: true
+#     app-ready-pattern: Server initialization complete
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import asyncio
+import logging
+
+from mobly import asserts
+from TC_SUTestBase import SoftwareUpdateBaseTest
+
+import matter.clusters as Clusters
+from matter import ChipDeviceCtrl
+from matter.clusters.Types import NullValue
+from matter.testing.decorators import async_test_body
+from matter.testing.event_attribute_reporting import AttributeSubscriptionHandler
+from matter.testing.matter_testing import AttributeMatcher
+from matter.testing.runner import TestStep, default_matter_test_main
+
+logger = logging.getLogger(__name__)
+
+
+class TC_SU_2_5(SoftwareUpdateBaseTest):
+    "This test case verifies that the DUT behaves according to the spec when it is applying the software update."
+    provider_kvs_path = None
+    provider_log = None
+    current_requestor_app_pid = None
+    ota_prov = Clusters.OtaSoftwareUpdateProvider
+    ota_req = Clusters.OtaSoftwareUpdateRequestor
+    controller = None
+    provider_node_id = 321
+    provider_discriminator = 321
+    provider_setup_pincode = 2321
+    ota_image_download_timeout = None
+    requestor_node_id = None
+
+    @async_test_body
+    async def teardown_test(self):
+        await self.clear_ota_providers(self.controller, self.requestor_node_id)
+        self.terminate_provider()
+        self.clear_kvs(kvs_path_prefix=self.provider_kvs_path)
+        super().teardown_test()
+
+    @async_test_body
+    async def setup_test(self):
+        # Set up Provider configuration and values for step1
+        self.ota_image = self.user_params.get('ota_image')
+        self.expected_software_version = self.user_params.get('ota_image_expected_version')
+        self.provider_app_path = self.user_params.get('provider_app_path')
+        self.ota_provider_port = self.user_params.get('ota_provider_port', 5541)
+        self.provider_kvs_path = self.user_params.get('provider_kvs_path', '/tmp/chip_kvs_provider')
+        self.provider_log = self.user_params.get('provider_log_path', '/tmp/provider_log_2_5.log')
+        # On average the ota image build for the CI is 1.8 MB which takes 4-5 min to download. Adjust if needed.
+        self.ota_image_download_timeout = self.user_params.get('ota_image_download_timeout', 60*5)
+        logger.info(f"Image download timeout is set to {self.ota_image_download_timeout} seconds")
+
+        if not self.provider_kvs_path.startswith('/tmp'):
+            asserts.fail("Provider KVS path must be placed in the /tmp directory.")
+
+        if self.ota_image_download_timeout <= 0:
+            asserts.fail("Invalid value for --int-arg ota_image_download_timeout:<seconds> value provided, must be equal or greater than 1.")
+
+        if not self.expected_software_version:
+            asserts.fail("Missing OTA image software version. Specify using --int-arg ota_image_expected_version:<ota_image_expected_version>")
+
+        if not self.provider_app_path:
+            asserts.fail("Missing provider app path. Specify using --string-arg provider_app_path:<provider_app_path>")
+
+        if not self.ota_image:
+            asserts.fail("Missing ota image path. Specify using --string-arg ota_image:<ota_image>")
+
+        if self.matter_test_config.timeout is None or self.matter_test_config.timeout <= 0:
+            asserts.fail(
+                "Test timeout parameter must be defined and greater than 0. A good timeout can be 1800 seconds or 30 minutes [ --timeout 1800 ]")
+
+        self.requestor_node_id = self.dut_node_id  # 123 with discriminator 123
+        self.requestor_passcode = self.matter_test_config.setup_passcodes[0]
+        self.controller = self.default_controller
+        # Extra Arguments required for the step 1
+        extra_arguments = ['--applyUpdateAction', 'proceed', '--delayedApplyActionTimeSec', '0']
+
+        self.start_provider(
+            provider_app_path=self.provider_app_path,
+            ota_image_path=self.ota_image,
+            setup_pincode=self.provider_setup_pincode,
+            discriminator=self.provider_discriminator,
+            port=self.ota_provider_port,
+            kvs_path=self.provider_kvs_path,
+            log_file=self.provider_log,
+            extra_args=extra_arguments,
+        )
+        logger.info("About to start commissioning")
+        await self.controller.CommissionOnNetwork(
+            nodeId=self.provider_node_id,
+            setupPinCode=self.provider_setup_pincode,
+            filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR,
+            filter=self.provider_discriminator
+        )
+        logger.info("Create ACL Entries")
+        await self.create_acl_entry(dev_ctrl=self.controller,
+                                    provider_node_id=self.provider_node_id, requestor_node_id=self.requestor_node_id)
+        logger.info("Write OTA Providers")
+        await self.set_default_ota_providers_list(controller=self.controller, provider_node_id=self.provider_node_id, requestor_node_id=self.requestor_node_id, endpoint=0)
+        super().setup_test()
+
+    def desc_TC_SU_2_5(self) -> str:
+        return " [TC-SU-2.5] Handling Different ApplyUpdateResponse Scenarios on Requestor"
+
+    def pics_TC_SU_2_5(self):
+        """Return the PICS definitions associated with this test."""
+        return ["MCORE.OTA.Requestor"]
+
+    def steps_TC_SU_2_5(self) -> list[TestStep]:
+        return [
+            TestStep(0, "Commissioning, already done", is_commissioning=True),
+            TestStep(1, "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action field is set to \"Proceed\", DelayedActionTime is set to 0.", "Verify that the DUT starts updating its software."
+                     "Once the update is finished, verify the SoftwareVersion attribute from the Basic Information cluster on the DUT to match the version downloaded for the software update."
+                     "Verify on the OTA-P/TH that there is no other ApplyUpdateRequest from the DUT."),
+            TestStep(2, "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action field is set to \"Proceed\", DelayedActionTime is set to 3 minutes.",
+                     "Verify that the DUT starts updating its software after 3 minutes. Once the update is finished, verify the SoftwareVersion attribute from the Basic Information cluster on the DUT to match the version downloaded for the software update."),
+            TestStep(3, "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action field is set to \"AwaitNextAction\", DelayedActionTime is set to 1 minute.", "Verify that the DUT waits for the minimum interval defined by spec which is 2 minutes before re-sending the ApplyUpdateRequest to the OTA-P."
+                     "Verify that the DUT does not apply the software update within this time."),
+            TestStep(4, "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action field is set to \"AwaitNextAction\", DelayedActionTime is set to 3 minutes. On the subsequent ApplyUpdateRequest command, TH/OTA-P sends the ApplyUpdateResponse back to DUT. Action field is set to \"Proceed\".", "Verify that the DUT waits for 3 minutes before sending the ApplyUpdateRequest to the OTA-P."
+                     "Verify that the DUT starts updating its software after the second ApplyUpdateResponse with Proceed action."
+                     "Once the update is finished, verify the SoftwareVersion attribute from the Basic Information cluster on the DUT to match the version downloaded for the software update."),
+            TestStep(5, "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action field is set to \"Discontinue\".", "Verify that the DUT clears its previously downloaded software image, and resets the UpdateState Attribute to Idle."
+                     "Verify that the DUT does not send the NotifyUpdateApplied within a reasonable time."
+                     "Verify the SoftwareVersion attribute from the Basic Information cluster of the DUT to be the same as it was previously."),
+        ]
+
+    async def _wait_for_idle_after_softwareaupdate(self, update_state_handler):
+        # On Physical Devices we don't know how much time it can take to apply the update so let the user help us.
+        # This should be updated to work automatically by detecting if the session is up and then read the UpdateState attribute
+        # This will allow us to remove the AttributeEventListener for kIdle and just read the attribute
+        if self.is_pics_sdk_ci_only:
+            update_state_match = AttributeMatcher.from_callable(
+                "Update state is Idle",
+                lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kIdle)
+            update_state_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+            update_state_handler.cancel()
+        else:
+            # Avoid keep listening if the device is gone.
+            update_state_handler.cancel()
+            self.wait_for_user_input(
+                prompt_msg="Waiting for device to Apply the Software update. Please press Enter when it is ready.\n")
+            update_state = await self.read_single_attribute_check_success(
+                dev_ctrl=self.controller,
+                cluster=Clusters.OtaSoftwareUpdateRequestor,
+                attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+            )
+            # After restart UpdateState must be kIdle
+            asserts.assert_equal(update_state, self.ota_req.Enums.UpdateStateEnum.kIdle)
+
+    @async_test_body
+    async def test_TC_SU_2_5(self):
+
+        self.step(0)
+
+        self.step(1)
+        update_state_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+        )
+        await update_state_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                              fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await self.announce_ota_provider(self.controller, self.provider_node_id, self.requestor_node_id)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Downloading",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading)
+        update_state_attr_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Applying",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kApplying)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=self.ota_image_download_timeout)
+
+        await self._wait_for_idle_after_softwareaupdate(update_state_handler=update_state_attr_handler)
+
+        # Once in idle verify the version match the expected software version
+        await self.verify_version_applied_basic_information(
+            controller=self.controller, node_id=self.requestor_node_id, target_version=self.expected_software_version)
+        update_state = await self.read_single_attribute_check_success(
+            Clusters.OtaSoftwareUpdateRequestor, Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState, self.controller, self.requestor_node_id, 0)
+        asserts.assert_equal(update_state, Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kIdle,
+                             "Update state should be idle")
+        self.terminate_provider()
+        self.restart_requestor(restore=True)
+
+        self.step(2)
+        # Set values for step 2
+        delayed_apply_action_time = 60*3
+        current_sw_version = await self.read_single_attribute_check_success(
+            dev_ctrl=self.controller,
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.SoftwareVersion,
+            node_id=self.requestor_node_id)
+        extra_arguments = ['--applyUpdateAction', 'proceed', '--delayedApplyActionTimeSec', str(delayed_apply_action_time)]
+        self.start_provider(
+            provider_app_path=self.provider_app_path,
+            ota_image_path=self.ota_image,
+            setup_pincode=self.provider_setup_pincode,
+            discriminator=self.provider_discriminator,
+            port=self.ota_provider_port,
+            kvs_path=self.provider_kvs_path,
+            log_file=self.provider_log,
+            extra_args=extra_arguments,
+        )
+
+        # Software Version Attr Handler
+        software_version_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.BasicInformation,
+            expected_attribute=Clusters.BasicInformation.Attributes.SoftwareVersion
+        )
+
+        # UpdateState Handler
+        update_state_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+        )
+        await software_version_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                                  fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+
+        await update_state_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                              fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+
+        await self.announce_ota_provider(self.controller, self.provider_node_id, self.requestor_node_id)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Downloading",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading)
+        update_state_attr_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Applying",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kApplying)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=self.ota_image_download_timeout)
+
+        # Device should stay in ApplyingState During 180 seconds and not Apply the software Update after the 60 seconds.
+        software_version_match = AttributeMatcher.from_callable(
+            f"Sofware Version should be: {current_sw_version}",
+            lambda report: report.value == current_sw_version)
+        software_version_attr_handler.wait_all_final_values_reported_persisted(
+            expected_matchers=[software_version_match], timeout_sec=delayed_apply_action_time)
+
+        software_version_attr_handler.flush_reports()
+        software_version_attr_handler.cancel()
+
+        await self._wait_for_idle_after_softwareaupdate(update_state_handler=update_state_attr_handler)
+
+        await self.verify_version_applied_basic_information(
+            controller=self.controller, node_id=self.requestor_node_id, target_version=self.expected_software_version)
+        # Terminate the provider
+        self.terminate_provider()
+        self.restart_requestor(restore=True)
+
+        self.step(3)
+        delayed_apply_action_time = 60
+        spec_wait_time = 120
+        extra_arguments = ['--applyUpdateAction', 'awaitNextAction', '--delayedApplyActionTimeSec', str(delayed_apply_action_time)]
+        self.start_provider(
+            provider_app_path=self.provider_app_path,
+            ota_image_path=self.ota_image,
+            setup_pincode=self.provider_setup_pincode,
+            discriminator=self.provider_discriminator,
+            port=self.ota_provider_port,
+            kvs_path=self.provider_kvs_path,
+            log_file=self.provider_log,
+            extra_args=extra_arguments,
+        )
+        current_sw_version = await self.read_single_attribute_check_success(
+            dev_ctrl=self.controller,
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.SoftwareVersion,
+            node_id=self.requestor_node_id)
+        # Software Version Attr Handler
+        software_version_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.BasicInformation,
+            expected_attribute=Clusters.BasicInformation.Attributes.SoftwareVersion
+        )
+        # StateUpdate Attr Handler
+        update_state_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+        )
+        await software_version_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                                  fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await update_state_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                              fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await self.announce_ota_provider(self.controller, self.provider_node_id, self.requestor_node_id)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Downloading",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading)
+        update_state_attr_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+
+        # Waits for nextAction
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is kDelayedOnApply",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDelayedOnApply)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=self.ota_image_download_timeout)
+
+        # Wwitches to Applying
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is kApplying",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kApplying)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=5)
+
+        # Device should stay in ApplyingState During 120 seconds and not Apply the software Update after the 60 seconds.
+        software_version_match = AttributeMatcher.from_callable(
+            f"Sofware Version should be: {current_sw_version}",
+            lambda report: report.value == current_sw_version)
+        software_version_attr_handler.wait_all_final_values_reported_persisted(
+            expected_matchers=[software_version_match], timeout_sec=spec_wait_time)
+        software_version_attr_handler.reset()
+        software_version_attr_handler.cancel()
+
+        await self._wait_for_idle_after_softwareaupdate(update_state_handler=update_state_attr_handler)
+
+        # Now software version should be in the expected software version
+        await self.verify_version_applied_basic_information(controller=self.controller, node_id=self.requestor_node_id, target_version=self.expected_software_version)
+        self.terminate_provider()
+        self.restart_requestor(restore=True)
+
+        self.step(4)
+        delayed_apply_action_time = 180
+        extra_arguments = ['--applyUpdateAction', 'awaitNextAction', '--delayedApplyActionTimeSec', str(delayed_apply_action_time)]
+        self.start_provider(
+            provider_app_path=self.provider_app_path,
+            ota_image_path=self.ota_image,
+            setup_pincode=self.provider_setup_pincode,
+            discriminator=self.provider_discriminator,
+            port=self.ota_provider_port,
+            kvs_path=self.provider_kvs_path,
+            log_file=self.provider_log,
+            extra_args=extra_arguments,
+        )
+        current_sw_version = await self.read_single_attribute_check_success(
+            dev_ctrl=self.controller,
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.SoftwareVersion,
+            node_id=self.requestor_node_id)
+        # Software Version attr handler
+        software_version_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.BasicInformation,
+            expected_attribute=Clusters.BasicInformation.Attributes.SoftwareVersion
+        )
+        #  UpdateState attr handler
+        update_state_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+        )
+        await update_state_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                              fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await software_version_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                                  fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await self.announce_ota_provider(self.controller, self.provider_node_id, self.requestor_node_id)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is Downloading",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading)
+        update_state_attr_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+
+        update_state_match = AttributeMatcher.from_callable(
+            "Update state is kDelayedOnApply",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDelayedOnApply)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=self.ota_image_download_timeout)
+        logger.info(f"Waiting the time of DelayedApplyAction of {delayed_apply_action_time} seconds.")
+
+        # Device should stay in ApplyingState and not apply the update during the 180 seconds. Only after this timeframe.
+        software_version_match = AttributeMatcher.from_callable(
+            f"Sofware Version should be: {current_sw_version}",
+            lambda report: report.value == current_sw_version)
+        software_version_attr_handler.wait_all_final_values_reported_persisted(
+            expected_matchers=[software_version_match], timeout_sec=delayed_apply_action_time)
+        software_version_attr_handler.reset()
+        software_version_attr_handler.cancel()
+
+        await self._wait_for_idle_after_softwareaupdate(update_state_handler=update_state_attr_handler)
+
+        # Verify the version is the same
+        await self.verify_version_applied_basic_information(controller=self.controller, node_id=self.requestor_node_id, target_version=self.expected_software_version)
+        self.terminate_provider()
+        self.restart_requestor(restore=True)
+
+        self.step(5)
+        extra_arguments = ['--applyUpdateAction', 'discontinue']
+        self.start_provider(
+            provider_app_path=self.provider_app_path,
+            ota_image_path=self.ota_image,
+            setup_pincode=self.provider_setup_pincode,
+            discriminator=self.provider_discriminator,
+            port=self.ota_provider_port,
+            kvs_path=self.provider_kvs_path,
+            log_file=self.provider_log,
+            extra_args=extra_arguments,
+        )
+        current_sw_version = await self.read_single_attribute_check_success(
+            dev_ctrl=self.controller,
+            cluster=Clusters.BasicInformation,
+            attribute=Clusters.BasicInformation.Attributes.SoftwareVersion,
+            node_id=self.requestor_node_id)
+        update_state_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState
+        )
+        download_progress_attr_handler = AttributeSubscriptionHandler(
+            expected_cluster=Clusters.OtaSoftwareUpdateRequestor,
+            expected_attribute=Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress
+        )
+        await update_state_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                              fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+        await download_progress_attr_handler.start(dev_ctrl=self.controller, node_id=self.requestor_node_id, endpoint=0,
+                                                   fabric_filtered=False, min_interval_sec=0, max_interval_sec=5)
+
+        await self.announce_ota_provider(self.controller, self.provider_node_id, self.requestor_node_id)
+        # Wait Until Downloading
+        update_state_match = AttributeMatcher.from_callable(
+            "Waiting Update state is Downloading",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading)
+        update_state_attr_handler.await_all_expected_report_matches([update_state_match], timeout_sec=600)
+
+        # This can be only be tested on CI or Locally, real devices might not have this path available.
+        if self.is_pics_sdk_ci_only:
+            # State is Downloading, let it run a few seconds to have some data to check.
+            await asyncio.sleep(3)
+            # Verify the default download path and the file size
+            # Read file for /tmp/test.bin should exists and greater than 0
+            ota_file_data = self.get_downloaded_ota_image_info()
+            logger.info(f"Downloaded ota image data {str(ota_file_data)}")
+            asserts.assert_equal(True, ota_file_data['exists'], f"File is was not downloaded  at {ota_file_data['path']}")
+            asserts.assert_greater(ota_file_data['size'], 0, "Downloaded file is still at 0")
+
+        # Device is downloading the image
+        progress_seen = False
+        last_progress = 0
+
+        def check_ota_download_matcher(report):
+            """Check for the UpdateStateProgress and confirms it downloaded the image when the
+                status reach to NullValue
+            Args:
+                report : Report value
+            """
+            value = report.value
+            nonlocal progress_seen, last_progress
+            if value is not NullValue and isinstance(value, int) and 1 <= value <= 100:
+                # Just check if we see some progress to confirm is downloading
+                last_progress = value
+                if not progress_seen:
+                    progress_seen = True
+            return bool(value is NullValue and progress_seen)
+
+        download_progress_attr_matcher_obj = AttributeMatcher.from_callable(
+            description="Waiting Download to Complete ", matcher=check_ota_download_matcher)
+        download_progress_attr_handler.await_all_expected_report_matches(
+            [download_progress_attr_matcher_obj], timeout_sec=self.ota_image_download_timeout)
+        download_progress_attr_handler.reset()
+        download_progress_attr_handler.cancel()
+
+        # Did not apply the software update
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=self.ota_image_download_timeout)
+        update_state_match = AttributeMatcher.from_callable(
+            "Waiting Update state is Idle",
+            lambda report: report.value == Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kIdle)
+        update_state_attr_handler.await_all_expected_report_matches(
+            [update_state_match], timeout_sec=600)
+        update_state_attr_handler.reset()
+        update_state_attr_handler.cancel()
+
+        # Make sure attr is Idle
+        update_state = await self.read_single_attribute_check_success(
+            Clusters.OtaSoftwareUpdateRequestor, Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState, self.controller, self.requestor_node_id, 0)
+        asserts.assert_equal(update_state, Clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kIdle,
+                             "Update state is not idle")
+        ota_file_data = self.get_downloaded_ota_image_info()
+        logger.info(f"Downloaded ota image data {str(ota_file_data)}")
+        asserts.assert_equal(ota_file_data['exists'], False, f"Downloaded file is still present {ota_file_data['path']}")
+        asserts.assert_equal(ota_file_data['size'], 0, "File size is greater than 0")
+        update_state_progress = await self.read_single_attribute_check_success(
+            Clusters.OtaSoftwareUpdateRequestor, Clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress, self.controller, self.requestor_node_id, 0)
+        asserts.assert_equal(update_state_progress, NullValue, "Progress is not Null")
+        logger.info(f"Progress is {update_state_progress}")
+        # Verify version is the same as when it  started
+        await self.verify_version_applied_basic_information(self.controller, self.requestor_node_id, current_sw_version)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_TMP_2_1.py b/src/python_testing/TC_TMP_2_1.py
index 99772ab5287..eba8c3b0a53 100644
--- a/src/python_testing/TC_TMP_2_1.py
+++ b/src/python_testing/TC_TMP_2_1.py
@@ -107,7 +107,7 @@ async def test_TC_TMP_2_1(self):
                 measured_value, max_bound, "Measured value is greater than max bound")
 
         self.step(7)
-        if self.pics_guard("TMP.S.A0003"):
+        if self.pics_guard(self.check_pics("TMP.S.A0003")):
             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")
diff --git a/src/python_testing/TC_TSTAT_4_3.py b/src/python_testing/TC_TSTAT_4_3.py
index bdd724a6c60..21030ca6f28 100644
--- a/src/python_testing/TC_TSTAT_4_3.py
+++ b/src/python_testing/TC_TSTAT_4_3.py
@@ -42,6 +42,7 @@
 from mobly import asserts
 
 import matter.clusters as Clusters
+from matter.clusters.Types import NullValue
 from matter.interaction_model import InteractionModelError, Status
 from matter.testing.decorators import async_test_body
 from matter.testing.matter_testing import MatterBaseTest
@@ -50,6 +51,11 @@
 log = logging.getLogger(__name__)
 
 cluster = Clusters.Thermostat
+time_cluster = Clusters.TimeSynchronization
+
+
+def get_epoch_utc_time():
+    return int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
 
 
 class TC_TSTAT_4_3(MatterBaseTest):
@@ -96,39 +102,41 @@ def steps_TC_TSTAT_4_3(self) -> list[TestStep]:
         return [
             TestStep("1", "Commissioning, already done",
                      is_commissioning=True),
-            TestStep("2", "TH reads the Presets attribute and saves it in a SupportedPresets variable.",
+            TestStep("2a", "TH reads the FeatureMap attribute.",
+                     "Verify that the TSUGGEST bit is set in the FeatureMap value."),
+            TestStep("2b", "TH reads the Presets attribute and saves it in a SupportedPresets variable.",
                      "Verify that the read returned a list of presets with count >=2."),
-            TestStep("3", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.",
+            TestStep("3", "TH checks if the Thermostat does not have a valid UTC time.",
+                     "Verify if the Thermostat does not have a valid UTC time and set the has_valid_time variable to false"),
+            TestStep("4a", "If has_valid_time is False, TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.",
                      "Verify that the AddThermostatSuggestion command returns INVALID_IN_STATE."),
-            TestStep("4", "TH sends Time Synchronization command to DUT using a time source.",
-                     "Verify that TH and DUT are now time synchronized."),
-            TestStep("5", "TH picks a random preset handle that does not match any entry in the Presets attribute and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp the ExpirationInMinutes is set to 1 minute.",
+            TestStep("4b", "If has_valid_time is False, TH sends Time Synchronization command to DUT using a time source.",
+                     "Verify that the Time Synchronization command returns SUCCESS otherwise fail the test."),
+            TestStep("5", "TH picks a random preset handle that does not match any entry in the Presets attribute and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.",
                      "Verify that the AddThermostatSuggestion command returns NOT_FOUND."),
-            TestStep("6a", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
+            TestStep("6a", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
                      "Verify that the AddThermostatSuggestion command returns an AddThermostatSuggestionResponse with a distinct value in the UniqueID field. Verify that the ThermostatSuggestions has one entry with the UniqueID field matching the UniqueID sent in the AddThermostatSuggestionResponse. Verify that the CurrentThermostatSuggestion attribute is set to the uniqueID, preset handle, the EffectiveTime, and the EffectiveTime plus ExpirationInMinutes (converted to seconds) passed in the AddThermostatSuggestion command. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is set to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
-            TestStep("6b", "TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.",
-                     "Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null."),
-            TestStep("7a", "TH sets TemperatureSetpointHold to SetpointHoldOn and TemperatureSetpointHoldDuration to null. TH reads the ActivePresetHandle attribute. TH picks any preset handle from the \"SupportedPresets\" variable that does not match the ActivePresetHandle and and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
+            TestStep("6b", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute to clean up the test.",
+                     "Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute."),
+            TestStep("7a", "TH sets TemperatureSetpointHold to SetpointHoldOn and TemperatureSetpointHoldDuration to null. TH reads the ActivePresetHandle attribute. TH picks any preset handle from the SupportedPresets variable that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
                      "Verify that the TemperatureSetpointHold is set to SetpointHoldOn and TemperatureSetpointHoldDuration is set to null. Verify that the AddThermostatSuggestion command returns an AddThermostatSuggestionResponse with a distinct value in the UniqueID field. Verify that the ThermostatSuggestions has one entry with the UniqueID field matching the UniqueID sent in the AddThermostatSuggestionResponse. Verify that the CurrentThermostatSuggestion attribute is set to the uniqueID, preset handle, the EffectiveTime, and the EffectiveTime plus ExpirationInMinutes (converted to seconds) passed in the AddThermostatSuggestion command, the ThermostatSuggestionNotFollowingReason is set to OngoingHold and the ActivePresetHandle attribute is not updated to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
-            TestStep("7b", "TH sets TemperatureSetpointHold to SetpointHoldOff after 10 seconds. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
+            TestStep("7b", "TH sets TemperatureSetpointHold to SetpointHoldOff after 2 seconds. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
                      "Verify that the TemperatureSetpointHold is set to SetpointHoldOff. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is updated to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
-            TestStep("7c", "TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.",
-                     "Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null."),
-            TestStep("8a", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
+            TestStep("7c", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute to clean up the test.",
+                     "Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute."),
+            TestStep("8a", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.",
                      "Verify that the AddThermostatSuggestion command returns an AddThermostatSuggestionResponse with a value in the UniqueID field. Verify that the ThermostatSuggestions has one entry with the UniqueID field matching the UniqueID sent in the AddThermostatSuggestionResponse. Verify that the CurrentThermostatSuggestion attribute is set to the uniqueID, preset handle, the EffectiveTime, and the EffectiveTime plus ExpirationInMinutes (converted to seconds) passed in the AddThermostatSuggestion command. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is set to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
             TestStep("8b", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to a value not matching the UniqueID field of the CurrentThermostatSuggestion attribute.",
                      "Verify that RemoveThermostatSuggestion command returns NOT_FOUND."),
-            TestStep("8c", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of then CurrentThermostatSuggestion attribute.",
-                     "Verify that that RemoveThermostatSuggestion command returns SUCCESS, the entry with the relevant UniqueID is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null."),
-            TestStep("9a", "TH reads the ActivePresetHandle attribute and saves it. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 2 minutes. TH calls the AddThermostatSuggestion command again with the saved ActivePresetHandle attribute value, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.",
+            TestStep("8c", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute.",
+                     "Verify that that RemoveThermostatSuggestion command returns SUCCESS that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute."),
+            TestStep("9a", "TH reads the ActivePresetHandle attribute and saves it. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 35 minutes. TH calls the AddThermostatSuggestion command again with the saved ActivePresetHandle attribute value, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.",
                      "Verify that both the AddThermostatSuggestion command return a AddThermostatSuggestionResponse with distinct values in the UniqueID field. TH saves both the UniqueID values. Verify that the ThermostatSuggestions has two entries with the UniqueID field matching one of the UniqueID fields sent in the two AddThermostatSuggestionResponse(s). Verify that the CurrentThermostatSuggestion attribute is set to the uniqueID, preset handle, the EffectiveTime, and the EffectiveTime plus ExpirationInMinutes (converted to seconds) of one of the entries in ThermostatSuggestions. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is set to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
-            TestStep("9b", "TH waits until the timestamp value specified in the earliest ExpirationTime field in the two entries in the ThermostatSuggestions attribute.",
-                     "Verify that the entry with the UniqueID that matches the earliest ExpirationTime in the two entries in the ThermostatSuggestions attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to the remaining entry in the ThermostatSuggestions attribute. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is set to the PresetHandle field of the CurrentThermostatSuggestion attribute."),
-            TestStep("9c", "TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.",
-                     "Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null."),
+            TestStep("9b", "TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID fields of the two entries in the ThermostatSuggestions attribute.",
+                     "Verify that both entries are removed from the ThermostatSuggestions attribute."),
             TestStep("10", "TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp plus 25 hours and the ExpirationInMinutes is set to 30 minutes.",
                      "Verify that the AddThermostatSuggestion command returns INVALID_COMMAND."),
-            TestStep("11", "TH reads the MaxThermostatSuggestions attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute for the number of times specified in the value of MaxThermostatSuggestions + 1.",
+            TestStep("11", "TH reads the MaxThermostatSuggestions attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes for the number of times specified in the value of MaxThermostatSuggestions + 1.",
                      "Verify that the AddThermostatSuggestion command returns SUCCESS and the ThermostatSuggestions attribute has one entry added to it for the first {MaxThermostatSuggestions} times. Verify that when the AddThermostatSuggestion command is called for the {MaxThermostatSuggestions + 1} time, the AddThermostatSuggestion command returns RESOURCE_EXHAUSTED.")
         ]
 
@@ -139,7 +147,17 @@ async def test_TC_TSTAT_4_3(self):
         self.step("1")
         # Commission DUT - already done
 
-        self.step("2")
+        self.step("2a")
+        if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
+            # TH reads the FeatureMap attribute.
+            feature_map = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.FeatureMap)
+            log.info(f"FeatureMap: {feature_map}")
+
+            # Verify that the TSUGGEST bit is set in the FeatureMap value.
+            asserts.assert_true(feature_map & cluster.Bitmaps.Feature.kThermostatSuggestions,
+                                "TSUGGEST bit is not set in the FeatureMap")
+
+        self.step("2b")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
             # TH reads the Presets attribute and saves it in a SupportedPresets variable.
             supported_presets = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.Presets)
@@ -148,68 +166,94 @@ async def test_TC_TSTAT_4_3(self):
             # Verify that the read returned a list of presets with count >=2.
             asserts.assert_greater_equal(len(supported_presets), 2)
 
-        # TODO Remove skipTimeSync once TimeSync details are ironed out in the test plan
-        skipTimeSync = True
-        if not skipTimeSync:
-            self.step("3")
+        has_valid_time = True
+        self.step("3")
+        if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
+            # TH checks if the Thermostat does not have a valid UTC time.
+            currentUTC = await self.read_single_attribute_check_success(endpoint=0, cluster=time_cluster, attribute=time_cluster.Attributes.UTCTime)
+
+            if currentUTC is NullValue or currentUTC is None:
+                has_valid_time = False
+
+        if not has_valid_time:
+            self.step("4a")
             if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-                # TH reads the ActivePresetHandle attribute.
+
+                # If has_valid_time is False, TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle,
+                # the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.
                 activePresetHandle = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ActivePresetHandle)
                 log.info(f"Active Preset Handlers: {activePresetHandle}")
-
-                # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.
                 possiblePresetHandles = [
                     preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
                 if len(possiblePresetHandles) > 0:
                     preset_handle = possiblePresetHandles[0]
+                    # Calculate the current UTC timestamp for use as the EffectiveTime.
+                    effective_time = get_epoch_utc_time()
                     # Verify that the AddThermostatSuggestion command returns INVALID_IN_STATE.
-                    currentUTC = int(int((datetime.now(timezone.utc) - datetime(2000,
-                                     1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds()))
                     await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                       preset_handle=preset_handle,
-                                                                      effective_time=currentUTC,
+                                                                      effective_time=effective_time,
                                                                       expiration_in_minutes=30,
                                                                       expected_status=Status.InvalidInState)
                 else:
                     log.info("Couldn't run test step 3 since all preset handles are also the ActivePresetHandle on this Thermostat")
 
-            self.step("4")
-            if not skipTimeSync:
-                # TH sends Time Synchronization command to DUT using a time source.
-                tts = Clusters.TimeSynchronization.Structs.FabricScopedTrustedTimeSourceStruct(nodeID=self.dut_node_id, endpoint=0)
-                await self.send_single_cmd(cmd=Clusters.TimeSynchronization.Commands.SetTrustedTimeSource(trustedTimeSource=tts), endpoint=endpoint)
-                # Verify that TH and DUT are now time synchronized.
-                # TODO Unsure how to validate this one. Read DUT through TimeSynchronization cluster and compare to datetime current time?
+            self.step("4b")
+            if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
+                # If has_valid_time is False, TH sends Time Synchronization command to DUT using a time source.
+                try:
+                    code = 0
+                    await self.send_single_cmd(cmd=time_cluster.Commands.SetUTCTime(UTCTime=get_epoch_utc_time() * 1_000_000, granularity=time_cluster.Enums.GranularityEnum.kMillisecondsGranularity), endpoint=0)
+                except InteractionModelError as e:
+                    # The python layer discards the cluster specific portion of the status IB, so for now we just expect a generic FAILURE error
+                    # see #26521
+                    code = e.status
+                # Verify that the Time Synchronization command returns SUCCESS otherwise fail the test.
+                asserts.assert_equal(
+                    code, 0, "Test failed because Thermostat has no UTCTime set and failed to set UTCTime. Thermostat suggestions feature needs UTCTime.")
         else:
-            log.info("TimeSync steps need to be ironed out, skipping for now.")
-            self.skip_step("3")
-            self.skip_step("4")
+            log.info("Thermostat has UTC time set.")
+            self.skip_step("4a")
+            self.skip_step("4b")
 
         self.step("5")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH picks a random preset handle that does not match any entry in the Presets attribute and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp the ExpirationInMinutes is set to 1 minute.
-            random_preset_handle = random.randbytes(16)
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
+            # TH picks a random preset handle that does not match any entry in the Presets attribute and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes set to 30 minutes.
+            existing_handles = {p.presetHandle for p in supported_presets}
+            # Use the maximum length of existing handles as an upper bound, with a conservative default if none exist.
+            max_handle_length = max((len(h) for h in existing_handles), default=32)
+            counter = 0
+            while True:
+                unique_preset_handle_str = f"{counter}"
+                unique_preset_handle = unique_preset_handle_str.encode("ascii")
+                if len(unique_preset_handle) > max_handle_length:
+                    asserts.fail(
+                        f"Generated preset handle '{unique_preset_handle_str}' exceeds maximum allowed length ({max_handle_length} bytes)"
+                    )
+                if unique_preset_handle not in existing_handles:
+                    break
+                counter += 1
+            currentUTC = get_epoch_utc_time()
             # Verify that the AddThermostatSuggestion command returns NOT_FOUND.
             await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
-                                                              preset_handle=random_preset_handle,
+                                                              preset_handle=unique_preset_handle,
                                                               effective_time=currentUTC,
                                                               expiration_in_minutes=30,
                                                               expected_status=Status.NotFound)
 
         self.step("6a")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH reads the ActivePresetHandle attribute.
+            # TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp
+            # and ExpirationInMinutes is set to 30 minutes. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.
             activePresetHandle = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ActivePresetHandle)
             log.info(f"Active Preset Handlers: {activePresetHandle}")
-            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.
             possiblePresetHandles = [
                 preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
             asserts.assert_greater_equal(
                 len(possiblePresetHandles), 1, "Couldn't run test step 6a since all preset handles are also the ActivePresetHandle on this Thermostat")
             presetHandle = possiblePresetHandles[0]
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            expirationInMinutes = 1
+            currentUTC = get_epoch_utc_time()
+            expirationInMinutes = 30
             addThermostatSuggestionResponse = await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                                                 preset_handle=presetHandle,
                                                                                                 effective_time=currentUTC,
@@ -250,36 +294,34 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("6b")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.
-            log.info(
-                f"Waiting until ExpirationTime field in CurrentThermostatSuggestion expires: {expirationInMinutes} minute/s")
-            await asyncio.sleep(expirationInMinutes * 60)
+            # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute to clean up the test.
+            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
+            await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
+                                                                 uniqueID=currentThermostatSuggestion.uniqueID,
+                                                                 expected_status=Status.Success)
 
-            # Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null.
+            # Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute.
             thermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ThermostatSuggestions)
             asserts.assert_equal(len(thermostatSuggestions), 0,
-                                 "ThermostatSuggestions should not have any entries after the ExpirationTime field in CurrentThermostatSuggestion expired.")
-            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
-            asserts.assert_equal(currentThermostatSuggestion, None,
-                                 "CurrentThermostatSuggestion should be Null after the ExpirationTime field in CurrentThermostatSuggestion expired.")
+                                 "ThermostatSuggestions should not have any entries after the matching entry was removed using the RemoveThermostatSuggestion command.")
 
         self.step("7a")
-        if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
+        if self.pics_guard(self.check_pics("TSTAT.S.F0a") and self.check_pics("TSTAT.S.A0023") and self.check_pics("TSTAT.S.A0024")):
             # TH sets TemperatureSetpointHold to SetpointHoldOn and TemperatureSetpointHoldDuration to null.
-            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHold(cluster.Thermostat.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOn), endpoint_id=endpoint, expect_success=True)
-            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHoldDuration(None), endpoint_id=endpoint, expect_success=True)
+            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHold(cluster.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOn), endpoint_id=endpoint, expect_success=True)
+            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHoldDuration(NullValue), endpoint_id=endpoint, expect_success=True)
 
             # TH reads the ActivePresetHandle attribute.
             activePresetHandle = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ActivePresetHandle)
             log.info(f"Active Preset Handlers: {activePresetHandle}")
-            # TH picks any preset handle from the \"SupportedPresets\" variable that does not match the ActivePresetHandle and and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.
+            # TH picks any preset handle from the SupportedPresets variable that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.
             possiblePresetHandles = [
                 preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
             asserts.assert_greater_equal(
                 len(possiblePresetHandles), 1, "Couldn't run test step 7a since all preset handles are also the ActivePresetHandle on this Thermostat")
             presetHandle = possiblePresetHandles[0]
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            expirationInMinutes = 1
+            currentUTC = get_epoch_utc_time()
+            expirationInMinutes = 30
             addThermostatSuggestionResponse = await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                                                 preset_handle=presetHandle,
                                                                                                 effective_time=currentUTC,
@@ -293,11 +335,11 @@ async def test_TC_TSTAT_4_3(self):
 
             # Verify that the TemperatureSetpointHold is set to SetpointHoldOn and TemperatureSetpointHoldDuration is set to null.
             temperatureSetpointHold = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.TemperatureSetpointHold)
-            asserts.assert_equal(temperatureSetpointHold, cluster.Thermostat.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOn,
+            asserts.assert_equal(temperatureSetpointHold, cluster.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOn,
                                  "TemperatureSetpointHold is not equal to SetpointHoldOn")
 
             temperatureSetpointHoldDuration = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.TemperatureSetpointHoldDuration)
-            asserts.assert_equal(temperatureSetpointHoldDuration, None, "TemperatureSetpointHoldDuration is not equal to Null")
+            asserts.assert_equal(temperatureSetpointHoldDuration, NullValue, "TemperatureSetpointHoldDuration is not equal to null")
 
             # Verify that the AddThermostatSuggestion command returns an AddThermostatSuggestionResponse with a distinct value in the UniqueID field.
             if addThermostatSuggestionResponse:
@@ -322,18 +364,20 @@ async def test_TC_TSTAT_4_3(self):
             asserts.assert_equal(currentThermostatSuggestion.expirationTime, expirationTime,
                                  "ExpirationTime in the CurrentThermostatSuggestion does not match the entry from AddThermostatSuggestion command.")
 
-            # the ThermostatSuggestionNotFollowingReason is set to OngoingHold and the ActivePresetHandle attribute is not updated to the PresetHandle field of the CurrentThermostatSuggestion attribute.
-            asserts.assert_equal(thermostatSuggestionNotFollowingReason,
-                                 cluster.Thermostat.Bitmaps.ThermostatSuggestionNotFollowingReasonBitmap.kOngoingHold,
-                                 "ThermostatSuggestionNotFollowingReason attribute should be equal to OngoingHold.")
-            asserts.assert_not_equal(activePresetHandle, presetHandle,
-                                     "ActivePresetHandle attribute should not be equal to the PresetHandle in the CurrentThermostatSuggestion attribute.")
+            # The ThermostatSuggestionNotFollowingReason is set to OngoingHold and the ActivePresetHandle attribute is not updated to the PresetHandle field of the CurrentThermostatSuggestion attribute.
+            # TODO: For now the ReEvaluateCurrentSuggestion API is in the delegate and we can't check whether a hold is set on the Thermostat. However as part of #39949, this will be addressed and the test
+            # can be uncommented.
+            # asserts.assert_equal(thermostatSuggestionNotFollowingReason,
+            # cluster.Bitmaps.ThermostatSuggestionNotFollowingReasonBitmap.kOngoingHold,
+            # "ThermostatSuggestionNotFollowingReason attribute should be equal to OngoingHold.")
+            # asserts.assert_not_equal(activePresetHandle, presetHandle,
+            # "ActivePresetHandle attribute should not be equal to the PresetHandle in the CurrentThermostatSuggestion attribute.")
 
         self.step("7b")
-        if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH sets TemperatureSetpointHold to SetpointHoldOff after 10 seconds.
-            await asyncio.sleep(10)
-            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHold(cluster.Thermostat.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOff), endpoint_id=endpoint, expect_success=True)
+        if self.pics_guard(self.check_pics("TSTAT.S.F0a") and self.check_pics("TSTAT.S.A0023") and self.check_pics("TSTAT.S.A0024")):
+            # TH sets TemperatureSetpointHold to SetpointHoldOff after 2 seconds.
+            await asyncio.sleep(2)
+            await self.write_single_attribute(attribute_value=cluster.Attributes.TemperatureSetpointHold(cluster.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOff), endpoint_id=endpoint, expect_success=True)
 
             # TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.
             currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
@@ -342,7 +386,7 @@ async def test_TC_TSTAT_4_3(self):
 
             # Verify that the TemperatureSetpointHold is set to SetpointHoldOff.
             temperatureSetpointHold = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.TemperatureSetpointHold)
-            asserts.assert_equal(temperatureSetpointHold, cluster.Thermostat.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOff,
+            asserts.assert_equal(temperatureSetpointHold, cluster.Enums.TemperatureSetpointHoldEnum.kSetpointHoldOff,
                                  "TemperatureSetpointHold is not equal to SetpointHoldOff")
 
             # If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is updated to the PresetHandle field of the CurrentThermostatSuggestion attribute.
@@ -352,32 +396,32 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("7c")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.
-            log.info(
-                f"Waiting until ExpirationTime field in CurrentThermostatSuggestion expires: {expirationInMinutes} minute/s")
-            await asyncio.sleep(expirationInMinutes * 60)
+            # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute to clean up the test.
+            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
+            await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
+                                                                 uniqueID=currentThermostatSuggestion.uniqueID,
+                                                                 expected_status=Status.Success)
 
-            # Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null.
+            # Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute.
             thermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ThermostatSuggestions)
             asserts.assert_equal(len(thermostatSuggestions), 0,
-                                 "ThermostatSuggestions should not have any entries after the ExpirationTime field in CurrentThermostatSuggestion expired.")
-            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
-            asserts.assert_equal(currentThermostatSuggestion, None,
-                                 "CurrentThermostatSuggestion should be Null after the ExpirationTime field in CurrentThermostatSuggestion expired.")
+                                 "ThermostatSuggestions should not have any entries after the RemoveThermostatSuggestion command removed the matching entry.")
 
         self.step("8a")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH reads the ActivePresetHandle attribute.
+            # TH reads the ActivePresetHandle attribute. TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp
+            # and ExpirationInMinutes is set to 30 minutes. TH reads the CurrentThermostatSuggestion, the ThermostatSuggestionNotFollowingReason and the ActivePresetHandle attributes.
             activePresetHandle = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ActivePresetHandle)
             log.info(f"Active Preset Handlers: {activePresetHandle}")
-            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.
+
+            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.
             possiblePresetHandles = [
                 preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
             asserts.assert_greater_equal(
                 len(possiblePresetHandles), 1, "Couldn't run test step 8a since all preset handles are also the ActivePresetHandle on this Thermostat")
             presetHandle = possiblePresetHandles[0]
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            expirationInMinutes = 1
+            currentUTC = get_epoch_utc_time()
+            expirationInMinutes = 30
             addThermostatSuggestionResponse = await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                                                 preset_handle=presetHandle,
                                                                                                 effective_time=currentUTC,
@@ -418,12 +462,11 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("8b")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            print()
             # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to a value not matching the UniqueID field of the CurrentThermostatSuggestion attribute.
             random_uniqueID = addThermostatSuggestionResponse_uniqueID
             while random_uniqueID == addThermostatSuggestionResponse_uniqueID:
                 random_uniqueID = random.randint(0, 255)
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
+            currentUTC = get_epoch_utc_time()
             # Verify that the RemoveThermostatSuggestion command returns NOT_FOUND.
             await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
                                                                  uniqueID=random_uniqueID,
@@ -431,42 +474,39 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("8c")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            print()
-            # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of then CurrentThermostatSuggestion attribute.
+            # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID field of the CurrentThermostatSuggestion attribute.
+            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
             await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
-                                                                 uniqueID=addThermostatSuggestionResponse_uniqueID,
+                                                                 uniqueID=currentThermostatSuggestion.uniqueID,
                                                                  expected_status=Status.Success)
-            # Verify that that RemoveThermostatSuggestion command returns SUCCESS, the entry with the relevant UniqueID is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null.
+            # Verify that the RemoveThermostatSuggestion command returns SUCCESS and that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute.
             thermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ThermostatSuggestions)
             asserts.assert_equal(len(thermostatSuggestions), 0,
                                  "ThermostatSuggestions should not have any entries after the relevant entry was removed by UniqueID.")
-            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
-            asserts.assert_equal(currentThermostatSuggestion, None,
-                                 "CurrentThermostatSuggestion should be Null after the relevant entry was removed by UniqueID.")
 
         self.step("9a")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
             # TH reads the ActivePresetHandle attribute and saves it.
             activePresetHandle = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ActivePresetHandle)
             log.info(f"Active Preset Handlers: {activePresetHandle}")
-            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 2 minutes.
+            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 35 minutes.
             possiblePresetHandles = [
                 preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
             asserts.assert_greater_equal(
                 len(possiblePresetHandles), 1, "Couldn't run test step 9a since all preset handles are also the ActivePresetHandle on this Thermostat")
             firstPresetHandle = possiblePresetHandles[0]
-            firstCurrentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            firstExpirationInMinutes = 2
+            firstCurrentUTC = get_epoch_utc_time()
+            firstExpirationInMinutes = 35
             firstAddThermostatSuggestionResponse = await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                                                      preset_handle=firstPresetHandle,
                                                                                                      effective_time=firstCurrentUTC,
                                                                                                      expiration_in_minutes=firstExpirationInMinutes,
                                                                                                      expected_status=Status.Success)
 
-            # TH calls the AddThermostatSuggestion command again with the saved ActivePresetHandle attribute value, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute.
+            # TH calls the AddThermostatSuggestion command again with the saved ActivePresetHandle attribute value, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes.
             secondPresetHandle = activePresetHandle
-            secondCurrentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            secondExpirationInMinutes = 1
+            secondCurrentUTC = get_epoch_utc_time()
+            secondExpirationInMinutes = 30
             secondAddThermostatSuggestionResponse = await self.send_add_thermostat_suggestion_command(endpoint=endpoint,
                                                                                                       preset_handle=secondPresetHandle,
                                                                                                       effective_time=secondCurrentUTC,
@@ -518,40 +558,24 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("9b")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            # TH waits until the timestamp value specified in the earliest ExpirationTime field in the two entries in the ThermostatSuggestions attribute.
-            expirationInMinutes = firstExpirationInMinutes if firstExpirationInMinutes < secondExpirationInMinutes else secondExpirationInMinutes
-            log.info(
-                f"Waiting until both ExpirationTime fields in ThermostatSuggestions expires: {expirationInMinutes} minute/s")
-            await asyncio.sleep(expirationInMinutes * 60)
-            # Verify that the entry with the UniqueID that matches the earliest ExpirationTime in the two entries in the ThermostatSuggestions attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to the remaining entry in the ThermostatSuggestions attribute. If the ThermostatSuggestionNotFollowingReason is set to null, verify that the ActivePresetHandle attribute is set to the PresetHandle field of the CurrentThermostatSuggestion attribute.
-            uniqueIDRemaining = secondAddThermostatSuggestionResponse_uniqueID if expirationInMinutes == firstExpirationInMinutes else firstAddThermostatSuggestionResponse_uniqueID
+            # TH calls the RemoveThermostatSuggestion command with the UniqueID field set to the UniqueID fields of the added Thermostat Suggestions to clean up the test.
+            await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
+                                                                 uniqueID=firstAddThermostatSuggestionResponse_uniqueID,
+                                                                 expected_status=Status.Success)
+
+            # Verify that the ThermostatSuggestions attribute has one entry in it.
             thermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ThermostatSuggestions)
             asserts.assert_equal(len(thermostatSuggestions), 1,
-                                 "ThermostatSuggestions should not have more than 1 entry after the ExpirationTime field in the earlier ThermostatSuggestion expired.")
-            asserts.assert_equal(thermostatSuggestions[0].uniqueID, uniqueIDRemaining,
-                                 "ThermostatSuggestions should have 1 entry with the UniqueID matching the ThermostatSuggestion with the longer ExpirationTime.")
+                                 "ThermostatSuggestions should have 1 entry after one suggestion has been removed.")
 
-            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
-            asserts.assert_equal(currentThermostatSuggestion,
-                                 thermostatSuggestions[0], "CurrentThermostatSuggestion should be set to the ThermostatSuggestion with the longer ExpirationTime.")
+            await self.send_remove_thermostat_suggestion_command(endpoint=endpoint,
+                                                                 uniqueID=secondAddThermostatSuggestionResponse_uniqueID,
+                                                                 expected_status=Status.Success)
 
-        self.step("9c")
-        if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            longerExpirationInMinutes = firstExpirationInMinutes if firstExpirationInMinutes > secondExpirationInMinutes else secondExpirationInMinutes
-            shorterExpirationInMinutes = firstExpirationInMinutes if firstExpirationInMinutes < secondExpirationInMinutes else secondExpirationInMinutes
-            expirationInMinutes = longerExpirationInMinutes - shorterExpirationInMinutes
-            # TH waits until the UTC timestamp specified in the ExpirationTime field in the CurrentThermostatSuggestion for the suggestion to expire.
-            log.info(
-                f"Waiting until ExpirationTime field in CurrentThermostatSuggestion expires: {expirationInMinutes} minute/s")
-            await asyncio.sleep(expirationInMinutes * 60)
-
-            # Verify that the entry with the UniqueID matching the UniqueID field in the CurrentThermostatSuggestion attribute is removed from the ThermostatSuggestions attribute and the CurrentThermostatSuggestion attribute is set to null.
+            # Verify that the ThermostatSuggestions attribute has no entry in it.
             thermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.ThermostatSuggestions)
             asserts.assert_equal(len(thermostatSuggestions), 0,
-                                 "ThermostatSuggestions should not have any entries after the ExpirationTime field in CurrentThermostatSuggestion expired.")
-            currentThermostatSuggestion = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.CurrentThermostatSuggestion)
-            asserts.assert_equal(currentThermostatSuggestion, None,
-                                 "CurrentThermostatSuggestion should be Null after the ExpirationTime field in CurrentThermostatSuggestion expired.")
+                                 "ThermostatSuggestions should have 0 entries after the second suggestion has been removed.")
 
         self.step("10")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
@@ -576,18 +600,17 @@ async def test_TC_TSTAT_4_3(self):
 
         self.step("11")
         if self.pics_guard(self.check_pics("TSTAT.S.F0a")):
-            print()
             # TH reads the MaxThermostatSuggestions attribute.
             maxThermostatSuggestions = await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=cluster.Attributes.MaxThermostatSuggestions)
             log.info(f"MaxThermostatSuggestions: {maxThermostatSuggestions}")
-            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and the ExpirationInMinutes is set to 1 minute for the number of times specified in the value of MaxThermostatSuggestions + 1.
+            # TH picks a preset handle from an entry in the SupportedPresets that does not match the ActivePresetHandle and calls the AddThermostatSuggestion command with the preset handle, the EffectiveTime set to the current UTC timestamp and ExpirationInMinutes is set to 30 minutes for the number of times specified in the value of MaxThermostatSuggestions + 1.
             possiblePresetHandles = [
                 preset.presetHandle for preset in supported_presets if preset.presetHandle != activePresetHandle]
             asserts.assert_greater_equal(
                 len(possiblePresetHandles), 1, "Couldn't run test step 11 since all preset handles are also the ActivePresetHandle on this Thermostat")
             presetHandle = possiblePresetHandles[0]
-            currentUTC = int((datetime.now(timezone.utc) - datetime(2000, 1, 1, 0, 0, 0, 0, timezone.utc)).total_seconds())
-            expirationInMinutes = maxThermostatSuggestions + 1
+            currentUTC = get_epoch_utc_time()
+            expirationInMinutes = 30
 
             # Verify that the AddThermostatSuggestion command returns SUCCESS and the ThermostatSuggestions attribute has one entry added to it for the first {MaxThermostatSuggestions} times.
             for i in range(0, maxThermostatSuggestions + 1):
diff --git a/src/python_testing/matter_testing_infrastructure/BUILD.gn b/src/python_testing/matter_testing_infrastructure/BUILD.gn
index 9c22c91e8d4..9be0c716aae 100644
--- a/src/python_testing/matter_testing_infrastructure/BUILD.gn
+++ b/src/python_testing/matter_testing_infrastructure/BUILD.gn
@@ -53,6 +53,12 @@ pw_python_package("matter-testing-module") {
     "matter/testing/event_attribute_reporting.py",
     "matter/testing/global_attribute_ids.py",
     "matter/testing/global_stash.py",
+    "matter/testing/linux/__init__.py",
+    "matter/testing/linux/bluetooth.py",
+    "matter/testing/linux/dbus.py",
+    "matter/testing/linux/namespace.py",
+    "matter/testing/linux/thread.py",
+    "matter/testing/linux/wifi.py",
     "matter/testing/matchers.py",
     "matter/testing/matter_asserts.py",
     "matter/testing/matter_stack_state.py",
@@ -147,6 +153,15 @@ pw_zip("data_model_zip_1_5_1") {
   output = "${root_out_dir}/data_model/zip_1_5_1.zip"
 }
 
+pw_zip("data_model_zip_1_6") {
+  inputs = []
+  foreach(file, data_model_XMLS_1_6) {
+    zip_path = rebase_path(file, "${chip_root}/data_model/1.6/", "/")
+    inputs += [ "${file} > /${zip_path}" ]
+  }
+  output = "${root_out_dir}/data_model/zip_1_6.zip"
+}
+
 pw_zip("credential_zip_development") {
   inputs = []
   foreach(file, credentials_development) {
@@ -186,6 +201,7 @@ pw_python_distribution("matter-testing") {
     ":data_model_zip_1_4_2",
     ":data_model_zip_1_5",
     ":data_model_zip_1_5_1",
+    ":data_model_zip_1_6",
   ]
 
   extra_files = [
@@ -197,6 +213,7 @@ pw_python_distribution("matter-testing") {
     "${root_out_dir}/data_model/zip_1_4_2.zip > matter/testing/data_model/1.4.2/allfiles.zip",
     "${root_out_dir}/data_model/zip_1_5.zip > matter/testing/data_model/1.5/allfiles.zip",
     "${root_out_dir}/data_model/zip_1_5_1.zip > matter/testing/data_model/1.5.1/allfiles.zip",
+    "${root_out_dir}/data_model/zip_1_6.zip > matter/testing/data_model/1.6/allfiles.zip",
     "${root_out_dir}/credentials/zip_development.zip > matter/testing/credentials/development/allfiles.zip",
     "${root_out_dir}/credentials/zip_production.zip > matter/testing/credentials/production/allfiles.zip",
   ]
diff --git a/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni b/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni
index 189b5044fb2..92bf7493290 100644
--- a/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni
+++ b/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni
@@ -1677,3 +1677,260 @@ data_model_XMLS_1_5_1 = [
   "${chip_root}/data_model/1.5.1/namespaces/Namespace-RoomAirConditioner.xml",
   "${chip_root}/data_model/1.5.1/namespaces/Namespace-Switches.xml",
 ]
+
+data_model_XMLS_1_6 = [
+  "${chip_root}/data_model/1.6/clusters/ACL-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/AccountLogin.xml",
+  "${chip_root}/data_model/1.6/clusters/ActionsCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/AdminCommissioningCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/AirQuality.xml",
+  "${chip_root}/data_model/1.6/clusters/AlarmBase.xml",
+  "${chip_root}/data_model/1.6/clusters/ApplicationBasic.xml",
+  "${chip_root}/data_model/1.6/clusters/ApplicationLauncher.xml",
+  "${chip_root}/data_model/1.6/clusters/AudioOutput.xml",
+  "${chip_root}/data_model/1.6/clusters/BasicInformationCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/Binding-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/BooleanState.xml",
+  "${chip_root}/data_model/1.6/clusters/BooleanStateConfiguration.xml",
+  "${chip_root}/data_model/1.6/clusters/BridgedDeviceBasicInformationCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/CameraAVSettingsUserLevelManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/CameraAVStreamManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/Channel.xml",
+  "${chip_root}/data_model/1.6/clusters/Chime.xml",
+  "${chip_root}/data_model/1.6/clusters/ClosureControl.xml",
+  "${chip_root}/data_model/1.6/clusters/ClosureDimension.xml",
+  "${chip_root}/data_model/1.6/clusters/ColorControl.xml",
+  "${chip_root}/data_model/1.6/clusters/CommissionerControlCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/CommodityMetering.xml",
+  "${chip_root}/data_model/1.6/clusters/CommodityPrice.xml",
+  "${chip_root}/data_model/1.6/clusters/CommodityTariff.xml",
+  "${chip_root}/data_model/1.6/clusters/ConcentrationMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/ContentAppObserver.xml",
+  "${chip_root}/data_model/1.6/clusters/ContentControl.xml",
+  "${chip_root}/data_model/1.6/clusters/ContentLauncher.xml",
+  "${chip_root}/data_model/1.6/clusters/Descriptor-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/DeviceEnergyManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticLogsCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticsEthernet.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticsGeneral.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticsSoftware.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticsThread.xml",
+  "${chip_root}/data_model/1.6/clusters/DiagnosticsWiFi.xml",
+  "${chip_root}/data_model/1.6/clusters/DishwasherAlarm.xml",
+  "${chip_root}/data_model/1.6/clusters/DoorLock.xml",
+  "${chip_root}/data_model/1.6/clusters/EcosystemInformationCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/ElectricalEnergyMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/ElectricalGridConditions.xml",
+  "${chip_root}/data_model/1.6/clusters/ElectricalPowerMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/EnergyEVSE.xml",
+  "${chip_root}/data_model/1.6/clusters/EnergyPreference.xml",
+  "${chip_root}/data_model/1.6/clusters/FanControl.xml",
+  "${chip_root}/data_model/1.6/clusters/FixedLabel-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/FlowMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/GeneralCommissioningCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/Group-Key-Management-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/Groupcast.xml",
+  "${chip_root}/data_model/1.6/clusters/Groups.xml",
+  "${chip_root}/data_model/1.6/clusters/ICDManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/Identify.xml",
+  "${chip_root}/data_model/1.6/clusters/IlluminanceMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/JointFabricAdministratorCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/JointFabricDatastoreCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/KeypadInput.xml",
+  "${chip_root}/data_model/1.6/clusters/Label-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/LaundryDryerControls.xml",
+  "${chip_root}/data_model/1.6/clusters/LaundryWasherControls.xml",
+  "${chip_root}/data_model/1.6/clusters/LevelControl.xml",
+  "${chip_root}/data_model/1.6/clusters/LocalizationConfiguration.xml",
+  "${chip_root}/data_model/1.6/clusters/LocalizationTimeFormat.xml",
+  "${chip_root}/data_model/1.6/clusters/LocalizationUnit.xml",
+  "${chip_root}/data_model/1.6/clusters/LowPower.xml",
+  "${chip_root}/data_model/1.6/clusters/MediaInput.xml",
+  "${chip_root}/data_model/1.6/clusters/MediaPlayback.xml",
+  "${chip_root}/data_model/1.6/clusters/Messages.xml",
+  "${chip_root}/data_model/1.6/clusters/MeterIdentification.xml",
+  "${chip_root}/data_model/1.6/clusters/MicrowaveOvenControl.xml",
+  "${chip_root}/data_model/1.6/clusters/ModeBase.xml",
+  "${chip_root}/data_model/1.6/clusters/ModeSelect.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_DeviceEnergyManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_Dishwasher.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_EVSE.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_LaundryWasher.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_MicrowaveOven.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_Oven.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_RVCClean.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_RVCRun.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_Refrigerator.xml",
+  "${chip_root}/data_model/1.6/clusters/Mode_WaterHeater.xml",
+  "${chip_root}/data_model/1.6/clusters/NetworkCommissioningCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/NetworkIdentityManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/OTAProvider.xml",
+  "${chip_root}/data_model/1.6/clusters/OTARequestor.xml",
+  "${chip_root}/data_model/1.6/clusters/OccupancySensing.xml",
+  "${chip_root}/data_model/1.6/clusters/OnOff.xml",
+  "${chip_root}/data_model/1.6/clusters/OperationalCredentialCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/OperationalState.xml",
+  "${chip_root}/data_model/1.6/clusters/OperationalState_Oven.xml",
+  "${chip_root}/data_model/1.6/clusters/OperationalState_RVC.xml",
+  "${chip_root}/data_model/1.6/clusters/PowerSourceCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/PowerSourceConfigurationCluster.xml",
+  "${chip_root}/data_model/1.6/clusters/PowerTopology.xml",
+  "${chip_root}/data_model/1.6/clusters/PressureMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/PumpConfigurationControl.xml",
+  "${chip_root}/data_model/1.6/clusters/PushAVStreamTransport.xml",
+  "${chip_root}/data_model/1.6/clusters/RefrigeratorAlarm.xml",
+  "${chip_root}/data_model/1.6/clusters/ResourceMonitoring.xml",
+  "${chip_root}/data_model/1.6/clusters/Scenes.xml",
+  "${chip_root}/data_model/1.6/clusters/ServiceArea.xml",
+  "${chip_root}/data_model/1.6/clusters/SmokeCOAlarm.xml",
+  "${chip_root}/data_model/1.6/clusters/SoilMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/Switch.xml",
+  "${chip_root}/data_model/1.6/clusters/TLSCertificateManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/TLSClientManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/TargetNavigator.xml",
+  "${chip_root}/data_model/1.6/clusters/TemperatureAlarm.xml",
+  "${chip_root}/data_model/1.6/clusters/TemperatureControl.xml",
+  "${chip_root}/data_model/1.6/clusters/TemperatureMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/Thermostat.xml",
+  "${chip_root}/data_model/1.6/clusters/ThermostatUserInterfaceConfiguration.xml",
+  "${chip_root}/data_model/1.6/clusters/ThreadBorderRouterDiagnostics.xml",
+  "${chip_root}/data_model/1.6/clusters/ThreadBorderRouterManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/ThreadNetworkDirectory.xml",
+  "${chip_root}/data_model/1.6/clusters/TimeSync.xml",
+  "${chip_root}/data_model/1.6/clusters/UserLabel-Cluster.xml",
+  "${chip_root}/data_model/1.6/clusters/ValveConfigurationControl.xml",
+  "${chip_root}/data_model/1.6/clusters/WakeOnLAN.xml",
+  "${chip_root}/data_model/1.6/clusters/WaterContentMeasurement.xml",
+  "${chip_root}/data_model/1.6/clusters/WaterHeaterManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/WebRTC_Provider.xml",
+  "${chip_root}/data_model/1.6/clusters/WebRTC_Requestor.xml",
+  "${chip_root}/data_model/1.6/clusters/WiFiNetworkManagement.xml",
+  "${chip_root}/data_model/1.6/clusters/WindowCovering.xml",
+  "${chip_root}/data_model/1.6/clusters/ZoneManagement.xml",
+  "${chip_root}/data_model/1.6/device_types/Aggregator.xml",
+  "${chip_root}/data_model/1.6/device_types/AirPurifier.xml",
+  "${chip_root}/data_model/1.6/device_types/AirQualitySensor.xml",
+  "${chip_root}/data_model/1.6/device_types/AmbientContextSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/AudioDoorbell.xml",
+  "${chip_root}/data_model/1.6/device_types/BaseDeviceType.xml",
+  "${chip_root}/data_model/1.6/device_types/BasicVideoPlayer.xml",
+  "${chip_root}/data_model/1.6/device_types/BatteryStorage.xml",
+  "${chip_root}/data_model/1.6/device_types/BridgedNode.xml",
+  "${chip_root}/data_model/1.6/device_types/Camera.xml",
+  "${chip_root}/data_model/1.6/device_types/CameraController.xml",
+  "${chip_root}/data_model/1.6/device_types/CastingVideoClient.xml",
+  "${chip_root}/data_model/1.6/device_types/CastingVideoPlayer.xml",
+  "${chip_root}/data_model/1.6/device_types/Chime.xml",
+  "${chip_root}/data_model/1.6/device_types/Closure.xml",
+  "${chip_root}/data_model/1.6/device_types/ClosureController.xml",
+  "${chip_root}/data_model/1.6/device_types/ClosurePanel.xml",
+  "${chip_root}/data_model/1.6/device_types/ColorDimmerSwitch.xml",
+  "${chip_root}/data_model/1.6/device_types/ColorTemperatureLight.xml",
+  "${chip_root}/data_model/1.6/device_types/ContactSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/ContentApp.xml",
+  "${chip_root}/data_model/1.6/device_types/ControlBridge.xml",
+  "${chip_root}/data_model/1.6/device_types/CookSurface.xml",
+  "${chip_root}/data_model/1.6/device_types/Cooktop.xml",
+  "${chip_root}/data_model/1.6/device_types/DeviceEnergyManagement.xml",
+  "${chip_root}/data_model/1.6/device_types/DimmableLight.xml",
+  "${chip_root}/data_model/1.6/device_types/DimmablePlug-InUnit.xml",
+  "${chip_root}/data_model/1.6/device_types/DimmerSwitch.xml",
+  "${chip_root}/data_model/1.6/device_types/Dishwasher.xml",
+  "${chip_root}/data_model/1.6/device_types/DoorLock.xml",
+  "${chip_root}/data_model/1.6/device_types/DoorLockController.xml",
+  "${chip_root}/data_model/1.6/device_types/Doorbell.xml",
+  "${chip_root}/data_model/1.6/device_types/EVSE.xml",
+  "${chip_root}/data_model/1.6/device_types/ElectricalEnergyTariff.xml",
+  "${chip_root}/data_model/1.6/device_types/ElectricalMeter.xml",
+  "${chip_root}/data_model/1.6/device_types/ElectricalSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/ElectricalUtilityMeter.xml",
+  "${chip_root}/data_model/1.6/device_types/ExtendedColorLight.xml",
+  "${chip_root}/data_model/1.6/device_types/ExtractorHood.xml",
+  "${chip_root}/data_model/1.6/device_types/Fan.xml",
+  "${chip_root}/data_model/1.6/device_types/FloodlightCamera.xml",
+  "${chip_root}/data_model/1.6/device_types/FlowSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/GenericSwitch.xml",
+  "${chip_root}/data_model/1.6/device_types/HeatPump.xml",
+  "${chip_root}/data_model/1.6/device_types/HumiditySensor.xml",
+  "${chip_root}/data_model/1.6/device_types/Intercom.xml",
+  "${chip_root}/data_model/1.6/device_types/IrrigationSystem.xml",
+  "${chip_root}/data_model/1.6/device_types/JointFabricAdmin.xml",
+  "${chip_root}/data_model/1.6/device_types/LaundryDryer.xml",
+  "${chip_root}/data_model/1.6/device_types/LaundryWasher.xml",
+  "${chip_root}/data_model/1.6/device_types/LightSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/MeterReferencePoint.xml",
+  "${chip_root}/data_model/1.6/device_types/MicrowaveOven.xml",
+  "${chip_root}/data_model/1.6/device_types/ModeSelectDeviceType.xml",
+  "${chip_root}/data_model/1.6/device_types/MountedDimmableLoadControl.xml",
+  "${chip_root}/data_model/1.6/device_types/MountedOnOffControl.xml",
+  "${chip_root}/data_model/1.6/device_types/NetworkInfraManager.xml",
+  "${chip_root}/data_model/1.6/device_types/OccupancySensor.xml",
+  "${chip_root}/data_model/1.6/device_types/OnOffLight.xml",
+  "${chip_root}/data_model/1.6/device_types/OnOffLightSwitch.xml",
+  "${chip_root}/data_model/1.6/device_types/OnOffPlug-inUnit.xml",
+  "${chip_root}/data_model/1.6/device_types/OnOffSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/OtaProvider.xml",
+  "${chip_root}/data_model/1.6/device_types/OtaRequestor.xml",
+  "${chip_root}/data_model/1.6/device_types/Oven.xml",
+  "${chip_root}/data_model/1.6/device_types/PowerSource.xml",
+  "${chip_root}/data_model/1.6/device_types/PressureSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/Pump.xml",
+  "${chip_root}/data_model/1.6/device_types/PumpController.xml",
+  "${chip_root}/data_model/1.6/device_types/RainSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/Refrigerator.xml",
+  "${chip_root}/data_model/1.6/device_types/RoboticVacuumCleaner.xml",
+  "${chip_root}/data_model/1.6/device_types/RoomAirConditioner.xml",
+  "${chip_root}/data_model/1.6/device_types/RootNodeDeviceType.xml",
+  "${chip_root}/data_model/1.6/device_types/SecondaryNetworkInterface.xml",
+  "${chip_root}/data_model/1.6/device_types/SmokeCOAlarm.xml",
+  "${chip_root}/data_model/1.6/device_types/SnapshotCamera.xml",
+  "${chip_root}/data_model/1.6/device_types/SoilSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/SolarPower.xml",
+  "${chip_root}/data_model/1.6/device_types/Speaker.xml",
+  "${chip_root}/data_model/1.6/device_types/TemperatureControlledCabinet.xml",
+  "${chip_root}/data_model/1.6/device_types/TemperatureSensor.xml",
+  "${chip_root}/data_model/1.6/device_types/Thermostat.xml",
+  "${chip_root}/data_model/1.6/device_types/ThermostatController.xml",
+  "${chip_root}/data_model/1.6/device_types/ThreadBorderRouter.xml",
+  "${chip_root}/data_model/1.6/device_types/VideoDoorbell.xml",
+  "${chip_root}/data_model/1.6/device_types/VideoRemoteControl.xml",
+  "${chip_root}/data_model/1.6/device_types/WaterFreezeDetector.xml",
+  "${chip_root}/data_model/1.6/device_types/WaterHeater.xml",
+  "${chip_root}/data_model/1.6/device_types/WaterLeakDetector.xml",
+  "${chip_root}/data_model/1.6/device_types/WaterValve.xml",
+  "${chip_root}/data_model/1.6/device_types/WindowCovering.xml",
+  "${chip_root}/data_model/1.6/device_types/WindowCoveringController.xml",
+  "${chip_root}/data_model/1.6/globals/Bitmaps.xml",
+  "${chip_root}/data_model/1.6/globals/Commands.xml",
+  "${chip_root}/data_model/1.6/globals/Enums.xml",
+  "${chip_root}/data_model/1.6/globals/Structs.xml",
+  "${chip_root}/data_model/1.6/globals/TypeDefs.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Closure-Cabinet.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Closure-Covering.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Closure-Window.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Closure.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-ClosurePanel.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-CommodityTariff-Chronology.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-CommodityTariff-Commodity.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-CommodityTariff-Flow.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Area.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Closure.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-CompassDirection.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-CompassLocation.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Direction.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Landmark.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Level.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Location.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Number.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-Position.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Common-RelativePosition.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-ElectricalMeasurement.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-IdentifiedHumanActivity.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-IdentifiedObject.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-IdentifiedSound.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Laundry.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-PowerSource.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Refrigerator.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-RoomAirConditioner.xml",
+  "${chip_root}/data_model/1.6/namespaces/Namespace-Switches.xml",
+]
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/commissioning.py b/src/python_testing/matter_testing_infrastructure/matter/testing/commissioning.py
index c3533a03b89..dae94adaf81 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/commissioning.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/commissioning.py
@@ -87,6 +87,8 @@ class CommissioningInfo:
     wifi_ssid: Optional[str] = None
     tc_version_to_simulate: Optional[int] = None
     tc_user_response_to_simulate: Optional[int] = None
+    thread_ba_host: Optional[str] = None
+    thread_ba_port: Optional[int] = None
 
 
 @dataclass
@@ -230,6 +232,33 @@ async def commission_device(
         except ChipStackError as e:  # chipstack-ok: Can not use 'with' because we handle and return the exception, not assert it
             LOGGER.exception("Commissioning failed")
             return PairingStatus(exception=e)
+    elif commissioning_info.commissioning_method == "thread-meshcop":
+        try:
+            asserts.assert_is_not_none(commissioning_info.thread_operational_dataset,
+                                       "Thread dataset must be provided for thread-meshcop commissioning")
+            # Type assertion to help mypy understand this is not None after the assert
+            assert commissioning_info.thread_operational_dataset is not None
+            asserts.assert_is_not_none(commissioning_info.thread_ba_host,
+                                       "thread_ba_host must be provided for thread-meshcop commissioning")
+            # Type assertion to help mypy understand this is not None after the assert
+            assert commissioning_info.thread_ba_host is not None
+            asserts.assert_is_not_none(commissioning_info.thread_ba_port,
+                                       "thread_ba_port must be provided for thread-meshcop commissioning")
+            # Type assertion to help mypy understand this is not None after the assert
+            assert commissioning_info.thread_ba_port is not None
+
+            await dev_ctrl.CommissionThreadMeshcop(
+                node_id,
+                info.passcode,
+                info.filter_value,
+                commissioning_info.thread_ba_host,
+                commissioning_info.thread_ba_port,
+                commissioning_info.thread_operational_dataset,
+            )
+            return PairingStatus()
+        except ChipStackError as e:  # chipstack-ok: Can not use 'with' because we handle and return the exception, not assert it
+            LOGGER.exception("Commissioning failed")
+            return PairingStatus(exception=e)
     else:
         raise ValueError("Invalid commissioning method %s!" % commissioning_info.commissioning_method)
 
@@ -339,6 +368,8 @@ def __init__(self, *args):
             wifi_ssid=meta_config['wifi_ssid'],
             tc_version_to_simulate=meta_config['tc_version_to_simulate'],
             tc_user_response_to_simulate=meta_config['tc_user_response_to_simulate'],
+            thread_ba_host=meta_config['thread_ba_host'],
+            thread_ba_port=meta_config['thread_ba_port'],
         )
         self.setup_payloads: List[SetupPayloadInfo] = get_setup_payload_info_config(
             global_stash.unstash_globally(test_config.user_params['matter_test_config']))
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/credentials.py b/src/python_testing/matter_testing_infrastructure/matter/testing/credentials.py
index 870c54d8439..883733713d1 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/credentials.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/credentials.py
@@ -19,7 +19,7 @@
 import os
 import zipfile
 from enum import Enum, auto
-from importlib.abc import Traversable
+from importlib.resources.abc import Traversable
 from typing import Union
 
 
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py b/src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
index b57720a32fb..f5cf0e8b90c 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
@@ -321,6 +321,47 @@ def wait_for_attribute_report(self, timeout_sec: float = 10.0) -> AttributeValue
 
         return item
 
+    def wait_all_final_values_reported_persisted(self, expected_matchers: Iterable[AttributeMatcher], timeout_sec: float = 1.0):
+        """Expect that every predicate in `expected_matchers` matches, when run against all the incoming reports until timeout.
+
+        Waits for all `timeout_sec` seconds.
+
+        Verify the matcher does not change the expected attribute report during the timeout.
+        """
+        start_time = time.time()
+        elapsed = 0.0
+        time_remaining = timeout_sec
+
+        # Matchers are true as we expect them to be true during all the report time.
+        report_matches: dict[int, bool] = {idx: True for idx, _ in enumerate(expected_matchers)}
+
+        for matcher in expected_matchers:
+            LOGGER.info(
+                f"--> Matcher waiting: {matcher.description}")
+        LOGGER.info(f"Waiting for {timeout_sec:.1f} seconds for all reports.")
+
+        while time_remaining > 0:
+            # Snapshot copy at the beginning of the loop. This is thread-safe based on the design.
+            all_reports = self._attribute_reports
+
+            # Recompute all last-value matches
+            for expected_idx, matcher in enumerate(expected_matchers):
+                for attribute, reports in all_reports.items():
+                    for report in reports:
+                        # if one the report does not match, terminate the check.
+                        if not matcher.matches(report) and report_matches[expected_idx]:
+                            asserts.fail(f"Unexpected report value {report.value} found within the timeframe {timeout_sec}")
+                        if matcher.matches(report) and report_matches[expected_idx]:
+                            report_matches[expected_idx] = True
+                            # LOGGER.info(f"  --> Expected value still the same. : {matcher.description}")
+            elapsed = time.time() - start_time
+            time_remaining = timeout_sec - elapsed
+            time.sleep(0.1)
+
+        if all(report_matches.values()):
+            LOGGER.info(f"Found all expected matchers did match in the period of time {timeout_sec:.1f}.")
+            return
+
     def await_all_final_values_reported(self, expected_final_values: Iterable[AttributeValue], timeout_sec: float = 1.0):
         """Expect that every `expected_final_value` report is the last value reported for the given attribute, ignoring timestamps.
 
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/__init__.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/__init__.py
new file mode 100644
index 00000000000..791b2ccf0a7
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/__init__.py
@@ -0,0 +1,32 @@
+
+#
+#    Copyright (c) 2026 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.
+#
+
+from .bluetooth import BluetoothMock
+from .dbus import DBusTestSystemBus
+from .namespace import IsolatedNetworkNamespace, ensure_network_namespace_availability, ensure_private_state
+from .thread import ThreadBorderRouter
+from .wifi import WpaSupplicantMock
+
+__all__ = [
+    "ensure_network_namespace_availability",
+    "ensure_private_state",
+    "BluetoothMock",
+    "DBusTestSystemBus",
+    "IsolatedNetworkNamespace",
+    "ThreadBorderRouter",
+    "WpaSupplicantMock"
+]
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/bluetooth.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/bluetooth.py
new file mode 100644
index 00000000000..6af5b9528e4
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/bluetooth.py
@@ -0,0 +1,48 @@
+#
+#    Copyright (c) 2026 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 logging
+import subprocess
+import threading
+
+log = logging.getLogger(__name__)
+
+
+class BluetoothMock(subprocess.Popen[str]):
+    """Run a BlueZ mock server in a subprocess."""
+
+    # The MAC addresses of the virtual Bluetooth adapters.
+    ADAPTERS = ["00:00:00:11:11:11", "00:00:00:22:22:22"]
+
+    def __forward_stderr(self):
+        assert self.stderr is not None, "stderr should have been set to subprocess.PIPE"
+        for line in self.stderr:
+            if "adapter[1][00:00:00:22:22:22]" in line:
+                self.event.set()
+            log.debug(line.strip())
+
+    def __init__(self):
+        adapters = [f"--adapter={mac}" for mac in self.ADAPTERS]
+        super().__init__(["bluezoo", "--auto-enable"] + adapters,
+                         stderr=subprocess.PIPE, text=True)
+        self.event = threading.Event()
+        threading.Thread(target=self.__forward_stderr, daemon=True).start()
+        # Wait for the adapters to be ready.
+        self.event.wait()
+
+    def terminate(self):
+        super().terminate()
+        self.wait()
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/dbus.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/dbus.py
new file mode 100644
index 00000000000..6a23006a034
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/dbus.py
@@ -0,0 +1,39 @@
+#
+#    Copyright (c) 2026 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
+import pathlib
+import subprocess
+
+
+class DBusTestSystemBus(subprocess.Popen[bytes]):
+    """Run a dbus-daemon in a subprocess as a test system bus."""
+
+    SOCKET = pathlib.Path(f"/tmp/chip-dbus-{os.getpid()}")
+    ADDRESS = f"unix:path={SOCKET}"
+
+    def __init__(self):
+        super().__init__(["dbus-daemon", "--session", "--print-address", "--address", self.ADDRESS],
+                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+        os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = self.ADDRESS
+        # Wait for the bus to start (it will print the address to stdout).
+        assert self.stdout is not None, "stdout should have been set to subprocess.PIPE"
+        self.stdout.readline()
+
+    def terminate(self):
+        super().terminate()
+        self.SOCKET.unlink(True)
+        self.wait()
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/namespace.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/namespace.py
new file mode 100644
index 00000000000..50fd933ab22
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/namespace.py
@@ -0,0 +1,209 @@
+#
+#    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 logging
+import os
+import shlex
+import subprocess
+import sys
+import time
+
+log = logging.getLogger(__name__)
+
+test_environ = os.environ.copy()
+
+
+def ensure_network_namespace_availability():
+    if os.getuid() == 0:
+        log.debug("Current user is root")
+        log.warning("Running as root and this will change global namespaces.")
+        return
+
+    os.execvpe(
+        "unshare", ["unshare", "--map-root-user", "-n", "-m", sys.executable,
+                    sys.argv[0], '--internal-inside-unshare'] + sys.argv[1:],
+        test_environ)
+
+
+def ensure_private_state():
+    log.info("Ensuring /run is privately accessible")
+
+    log.debug("Making / private")
+    if subprocess.run(["mount", "--make-private", "/"]).returncode != 0:
+        log.error("Failed to make / private")
+        log.error("Are you using --privileged if running in docker?")
+        sys.exit(1)
+
+    log.debug("Remounting /run")
+    if subprocess.run(["mount", "-t", "tmpfs", "tmpfs", "/run"]).returncode != 0:
+        log.error("Failed to mount /run as a temporary filesystem")
+        log.error("Are you using --privileged if running in docker?")
+        sys.exit(1)
+
+
+class IsolatedNetworkNamespace:
+    """Helper class to create and remove network namespaces for tests."""
+
+    # Commands for creating appropriate namespaces for a tool and app binaries
+    # in the simulated isolated network.
+    COMMANDS_SETUP = [
+        # Create 2 virtual hosts: for app and for the tool
+        "ip netns add app-{index}",
+        "ip netns add tool-{index}",
+        'sysctl -w net.ipv6.conf.all.forwarding=1',
+        'sysctl -w net.ipv6.conf.default.forwarding=1',
+
+        # Create links for switch to net connections
+        "ip link add {app_link_name}-{index} type veth peer name {app_link_name}-sw-{index}",
+        "ip link add {tool_link_name}-{index} type veth peer name {tool_link_name}-sw-{index}",
+        "ip link add eth-ci-{index} type veth peer name eth-ci-sw-{index}",
+
+        # Link the connections together
+        "ip link set {app_link_name}-{index} netns app-{index}",
+        "ip link set {tool_link_name}-{index} netns tool-{index}",
+
+        # Bridge all the connections together.
+        "ip link add name br1-{index} type bridge",
+        "ip link set br1-{index} up",
+        "ip link set {app_link_name}-sw-{index} master br1-{index}",
+        "ip link set {tool_link_name}-sw-{index} master br1-{index}",
+        "ip link set eth-ci-sw-{index} master br1-{index}",
+
+        # Create link between virtual host 'tool' and the test runner
+        "ip addr add 10.10.10.5/24 dev eth-ci-{index}",
+        "ip link set dev eth-ci-{index} up",
+        "ip link set dev eth-ci-sw-{index} up",
+    ]
+
+    # Bring up application connection link.
+    COMMANDS_APP_LINK_UP = [
+        "ip netns exec app-{index} ip addr add 10.10.10.1/24 dev {app_link_name}-{index}",
+        "ip netns exec app-{index} ip link set dev {app_link_name}-{index} up",
+        "ip netns exec app-{index} ip link set dev lo up",
+        "ip link set dev {app_link_name}-sw-{index} up",
+        "ip netns exec app-{index} ip -6 addr flush {app_link_name}-{index}",
+        "ip netns exec app-{index} ip -6 a add fe80::1/64 dev {app_link_name}-{index}",
+        "ip netns exec app-{index} sysctl -w net.ipv6.conf.{app_link_name}-{index}.accept_ra=2",
+        "ip netns exec app-{index} sysctl -w net.ipv6.conf.{app_link_name}-{index}.accept_ra_rt_info_max_plen=64",
+        'ip netns exec app-{index} sysctl -w net.ipv6.conf.all.forwarding=1',
+        'ip netns exec app-{index} sysctl -w net.ipv6.conf.default.forwarding=1',
+    ]
+
+    COMMANDS_APP_LINK_ULA = [
+        # Force IPv6 to use ULAs that we control.
+        "ip netns exec app-{index} ip -6 a add fd00:0:1:1::1/64 dev {app_link_name}-{index}",
+    ]
+
+    # Bring up tool (controller) connection link.
+    COMMANDS_TOOL_LINK_UP = [
+        "ip netns exec tool-{index} ip addr add 10.10.10.2/24 dev {tool_link_name}-{index}",
+        "ip netns exec tool-{index} ip link set dev {tool_link_name}-{index} up",
+        "ip netns exec tool-{index} ip link set dev lo up",
+        "ip link set dev {tool_link_name}-sw-{index} up",
+        "ip netns exec tool-{index} ip -6 addr flush {tool_link_name}-{index}",
+        "ip netns exec tool-{index} ip -6 a add fe80::2/64 dev {tool_link_name}-{index}",
+        "ip netns exec tool-{index} sysctl -w net.ipv6.conf.{tool_link_name}-{index}.accept_ra=2",
+        "ip netns exec tool-{index} sysctl -w net.ipv6.conf.{tool_link_name}-{index}.accept_ra_rt_info_max_plen=64",
+    ]
+
+    COMMANDS_TOOL_LINK_ULA = [
+        # Force IPv6 to use ULAs that we control.
+        "ip netns exec tool-{index} ip -6 a add fd00:0:1:1::2/64 dev {tool_link_name}-{index}",
+    ]
+
+    # Commands for removing namespaces previously created.
+    COMMANDS_TERMINATE = [
+        "ip link set dev eth-ci-{index} down",
+        "ip link set dev eth-ci-sw-{index} down",
+        "ip addr del 10.10.10.5/24 dev eth-ci-{index}",
+
+        "ip link set br1-{index} down",
+        "ip link delete br1-{index}",
+
+        "ip link delete eth-ci-sw-{index}",
+        "ip link delete {tool_link_name}-sw-{index}",
+        "ip link delete {app_link_name}-sw-{index}",
+
+        "ip netns del tool-{index}",
+        "ip netns del app-{index}",
+    ]
+
+    def __init__(self, index: int = 0, setup_app_link_up: bool = True, setup_tool_link_up: bool = True,
+                 app_link_name: str = 'eth-app', tool_link_name: str = 'eth-tool', add_ula: bool = True):
+        self.index = index
+        self.app_link_name = app_link_name
+        self.tool_link_name = tool_link_name
+
+        try:
+            self._setup()
+            if setup_app_link_up:
+                self.setup_app_link_up(add_ula, wait_for_dad=False)
+            if setup_tool_link_up:
+                self._setup_tool_link_up(add_ula, wait_for_dad=False)
+            self._wait_for_duplicate_address_detection()
+        except BaseException:
+            # Ensure that we leave a clean state on any exception.
+            self.terminate()
+            raise
+
+    def netns_for_subprocess_kind(self, name: str):
+        return "{}-{}".format(name, self.index)
+
+    def _wait_for_duplicate_address_detection(self):
+        # IPv6 does Duplicate Address Detection even though
+        # we know ULAs provided are isolated. Wait for 'tentative'
+        # address to be gone.
+        log.info("Waiting for IPv6 DaD to complete (no tentative addresses)")
+        for _ in range(100):  # wait at most 10 seconds
+            if 'tentative' not in subprocess.check_output(['ip', 'addr'], text=True):
+                log.info("No more tentative addresses")
+                break
+            time.sleep(0.1)
+        else:
+            log.warning("Some addresses look to still be tentative")
+
+    def _setup(self):
+        self._run(*self.COMMANDS_SETUP)
+
+    def setup_app_link_up(self, add_ula: bool = True, wait_for_dad: bool = True):
+        self._run(*self.COMMANDS_APP_LINK_UP)
+        if add_ula:
+            self._run(*self.COMMANDS_APP_LINK_ULA)
+        if wait_for_dad:
+            self._wait_for_duplicate_address_detection()
+
+    def _setup_tool_link_up(self, add_ula: bool = True, wait_for_dad: bool = True):
+        self._run(*self.COMMANDS_TOOL_LINK_UP)
+        if add_ula:
+            self._run(*self.COMMANDS_TOOL_LINK_ULA)
+        if wait_for_dad:
+            self._wait_for_duplicate_address_detection()
+
+    def _run(self, *command: str):
+        for c in command:
+            c = c.format(app_link_name=self.app_link_name, tool_link_name=self.tool_link_name, index=self.index)
+            log.debug("Executing: '%s'", c)
+            if subprocess.run(shlex.split(c)).returncode != 0:
+                raise RuntimeError(f"Failed to execute '{c}'. Are you using --privileged if running in docker?")
+
+    def terminate(self):
+        """Execute all down commands gracefully omitting errors."""
+        for cmd in self.COMMANDS_TERMINATE:
+            try:
+                self._run(cmd)
+            except Exception as e:
+                log.warning("Encountered error during namespace termination: %s", e)
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/thread.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/thread.py
new file mode 100644
index 00000000000..1df617728b9
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/thread.py
@@ -0,0 +1,112 @@
+#
+#    Copyright (c) 2026 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 logging
+import os
+import re
+import shlex
+import subprocess
+import threading
+from typing import Optional, Pattern
+
+from .namespace import IsolatedNetworkNamespace
+
+log = logging.getLogger(__name__)
+
+
+class ThreadBorderRouter:
+
+    # The Thread radio simulation node id, choose other if there is a conflict.
+    NODE_ID = 9
+
+    def __init__(self, dataset: str, ns: IsolatedNetworkNamespace):
+        self._event = threading.Event()
+        self._pattern: Optional[Pattern[str]] = None
+        self._event.set()
+        self._netns_app = f'app-{ns.index}'
+        self._netns_tool = f'tool-{ns.index}'
+        self._link_name_app = f'{ns.app_link_name}-{ns.index}'
+        self._link_name_tool = f'{ns.tool_link_name}-{ns.index}'
+
+        radio_url = f'spinel+hdlc+forkpty:///usr/bin/env?forkpty-arg=ot-rcp&forkpty-arg={self.NODE_ID}'
+        args = [
+            'ip', 'netns', 'exec', self._netns_app, 'otbr-agent', '-d7', '-v', f'-B{self._link_name_app}', radio_url
+        ]
+
+        self._otbr = subprocess.Popen(args,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.STDOUT,
+                                      text=True,
+                                      encoding='UTF-8')
+
+        threading.Thread(target=self._otbr_read_stdout, daemon=True).start()
+
+        self.expect(r'Co-processor version:', timeout=20)
+        self.join_network(dataset)
+
+    def join_network(self, dataset):
+        status = os.system(
+            f'ot-ctl dataset init tlvs {dataset} &&'
+            'ot-ctl dataset commit active &&'
+            'ot-ctl ifconfig up &&'
+            'ot-ctl routerselectionjitter 1 &&'
+            'ot-ctl thread start &&'
+            'ot-ctl state leader &&'
+            'while ! ot-ctl state | grep -q leader; do sleep 1; done &&'
+            'ot-ctl netdata show &&'
+            'ot-ctl srp server enable &&'
+            'while ! ot-ctl br state | grep -q running; do sleep 1; done &&'
+            'echo TBR ready'
+        )
+        if status != 0:
+            raise RuntimeError("Failed to control Thread Border Router")
+
+        self.expect(r'Sent RA on infra netif', timeout=15)
+
+    def expect(self, pattern: str, timeout=10):
+        self._pattern = re.compile(pattern)
+        self._event.clear()
+        if not self._event.wait(timeout):
+            raise TimeoutError(f'Failed to expect: {pattern}')
+
+    def _otbr_read_stdout(self):
+        assert self._otbr.stdout is not None
+        while (line := self._otbr.stdout.readline()):
+            log.info(line)
+            if self._event.is_set():
+                continue
+            if not self._pattern:
+                continue
+            if self._pattern.search(line):
+                self._event.set()
+
+    def get_border_agent_port(self) -> int:
+        cmd = f'ip netns exec {self._netns_app} ot-ctl ba port'
+        output = subprocess.check_output(shlex.split(cmd), text=True)
+        # ot-ctl output includes the port number followed by "Done"
+        # Using regex to find the first number in the output
+        match = re.search(r'(\d+)', output)
+        if not match:
+            raise RuntimeError(f"Failed to parse border agent port from: {output}")
+        return int(match.group(1))
+
+    def get_border_agent_host(self) -> str:
+        return '10.10.10.1'
+
+    def terminate(self):
+        if self._otbr:
+            self._otbr.terminate()
+            self._otbr.wait()
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/linux/wifi.py b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/wifi.py
new file mode 100644
index 00000000000..7c165bfa508
--- /dev/null
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/linux/wifi.py
@@ -0,0 +1,180 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+"""
+Handles linux-specific functionality for running test cases
+"""
+
+from __future__ import annotations
+
+import asyncio
+import threading
+from typing import Union
+
+import sdbus
+
+from .namespace import IsolatedNetworkNamespace
+
+DbusAnyT = Union[bool, int, float, str, bytes, list["DbusAnyT"], tuple["DbusAnyT", ...], dict[str, "DbusAnyT"], "DictVariantT"]
+DictVariantT = dict[str, tuple[str, DbusAnyT]]
+
+
+class WpaSupplicantMock(threading.Thread):
+    """Mock server for WpaSupplicant D-Bus API.
+
+    This mock runs on its own thread and exposes a minimal subset of the
+    WpaSupplicant D-Bus API to allow Matter devices to interact with it.
+    It allows to create only one interface with one mocked network on it.
+
+    Network SSID and password need to be provided when creating the mock.
+    However, as for now, the password is not actually used for anything, so
+    any password will work and allow to perform AP association. During the
+    association process, between the "associated" and "completed" states,
+    the provided IsolatedNetworkNamespace instance is used to bring up the
+    link to simulate network connectivity.
+    """
+
+    class Wpa(sdbus.DbusInterfaceCommonAsync,
+              interface_name="fi.w1.wpa_supplicant1"):
+        path = "/fi/w1/wpa_supplicant1"
+
+        @sdbus.dbus_method_async("a{sv}", "o")
+        async def CreateInterface(self, args: DictVariantT) -> str:
+            # Always return our pre-defined mock interface.
+            return WpaSupplicantMock.WpaInterface.path
+
+        @sdbus.dbus_method_async("s", "o")
+        async def GetInterface(self, name: str) -> str:
+            # Always return our pre-defined mock interface.
+            return WpaSupplicantMock.WpaInterface.path
+
+    class WpaInterface(sdbus.DbusInterfaceCommonAsync,
+                       interface_name="fi.w1.wpa_supplicant1.Interface"):
+        path = "/fi/w1/wpa_supplicant1/Interfaces/1"
+        state = "disconnected"
+        current_network = "/"
+
+        def __init__(self, mock: WpaSupplicantMock):
+            super().__init__()
+            self.mock = mock
+
+        @sdbus.dbus_method_async("s")
+        async def AutoScan(self, arg: str) -> None:
+            pass
+
+        @sdbus.dbus_method_async("a{sv}")
+        async def Scan(self, args: DictVariantT) -> None:
+            pass
+
+        @sdbus.dbus_method_async("a{sv}", "o")
+        async def AddNetwork(self, args: DictVariantT) -> str:
+            # Always return our pre-defined mock network.
+            return WpaSupplicantMock.WpaNetwork.path
+
+        @sdbus.dbus_method_async("o")
+        async def SelectNetwork(self, path: str) -> None:
+            async def associate():
+                # Mock AP association process.
+                await self.State.set_async("associating")
+                await self.State.set_async("associated")
+                self.mock.networking.setup_app_link_up()
+                await self.State.set_async("completed")
+            await self.CurrentNetwork.set_async(path)
+            asyncio.create_task(associate())
+
+        @sdbus.dbus_method_async("o")
+        async def RemoveNetwork(self, path: str) -> None:
+            await self.CurrentNetwork.set_async("/")
+
+        @sdbus.dbus_method_async()
+        async def RemoveAllNetworks(self) -> None:
+            await self.CurrentNetwork.set_async("/")
+
+        @sdbus.dbus_method_async()
+        async def Disconnect(self) -> None:
+            pass
+
+        @sdbus.dbus_method_async()
+        async def SaveConfig(self) -> None:
+            pass
+
+        @sdbus.dbus_property_async("s")
+        def State(self) -> str:
+            return self.state
+
+        @State.setter_private
+        def State_setter(self, value: str) -> None:
+            self.state = value
+
+        @sdbus.dbus_property_async("o")
+        def CurrentNetwork(self) -> str:
+            return self.current_network
+
+        @CurrentNetwork.setter_private
+        def CurrentNetwork_setter(self, value: str) -> None:
+            self.current_network = value
+
+        @sdbus.dbus_property_async("s")
+        def CurrentAuthMode(self) -> str:
+            return "WPA2-PSK"
+
+    class WpaNetwork(sdbus.DbusInterfaceCommonAsync,
+                     interface_name="fi.w1.wpa_supplicant1.Network"):
+        path = "/fi/w1/wpa_supplicant1/Interfaces/1/Networks/1"
+        enabled = False
+
+        def __init__(self, mock: WpaSupplicantMock):
+            super().__init__()
+            self.mock = mock
+
+        @sdbus.dbus_property_async("a{sv}")
+        def Properties(self) -> DictVariantT:
+            return {"ssid": ("s", self.mock.ssid)}
+
+        @sdbus.dbus_property_async("b")
+        def Enabled(self) -> bool:
+            return self.enabled
+
+        @Enabled.setter
+        def Enabled_setter(self, value: bool) -> None:
+            self.enabled = value
+
+    async def startup(self):
+        # Attach to the system bus which in fact is our mock bus.
+        bus = sdbus.sd_bus_open_system()
+        sdbus.set_default_bus(bus)
+        # Acquire name on the system bus.
+        await bus.request_name_async("fi.w1.wpa_supplicant1", 0)
+        # Expose interfaces of our service.
+        self.wpa = WpaSupplicantMock.Wpa()
+        self.wpa.export_to_dbus(self.wpa.path)
+        self.iface = WpaSupplicantMock.WpaInterface(self)
+        self.iface.export_to_dbus(self.iface.path)
+        self.net = WpaSupplicantMock.WpaNetwork(self)
+        self.net.export_to_dbus(self.net.path)
+
+    def __init__(self, ssid: str, password: str, ns: IsolatedNetworkNamespace):
+        self.ssid = ssid
+        self.password = password
+        self.networking = ns
+        self.loop = asyncio.new_event_loop()
+        self.loop.run_until_complete(self.startup())
+        super().__init__(target=self.loop.run_forever)
+        self.start()
+
+    def terminate(self):
+        self.loop.call_soon_threadsafe(self.loop.stop)
+        self.join()
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py
index f2a8e3087c5..68ffd3ebb29 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py
@@ -52,6 +52,10 @@ class MatterTestConfig:
     # This allows cert tests to be run without re-commissioning for RR-1.1.
     maximize_cert_chains: bool = True
 
+    # Border Agent information for Thread MeshCoP Commissioning
+    thread_ba_host: Optional[str] = None
+    thread_ba_port: Optional[int] = None
+
     # By default, let's set validity to 10 years
     certificate_validity_period = int(timedelta(days=10*365).total_seconds())
 
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
index c8cb5da3eba..32e34b447b2 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
@@ -879,6 +879,8 @@ async def commission_devices(self) -> bool:
             wifi_ssid=self.matter_test_config.wifi_ssid,
             tc_version_to_simulate=self.matter_test_config.tc_version_to_simulate,
             tc_user_response_to_simulate=self.matter_test_config.tc_user_response_to_simulate,
+            thread_ba_host=self.matter_test_config.thread_ba_host,
+            thread_ba_port=self.matter_test_config.thread_ba_port,
         )
 
         return await commission_devices(dev_ctrl, dut_node_ids, setup_payloads, commissioning_info)
@@ -1509,28 +1511,39 @@ async def request_device_reboot(self):
         else:
             try:
                 # Create the restart flag file to signal the test runner
+                # Allow for multiple reboots like SW update tests do using the "restart" mode
+                restart_text = "restart"
                 with open(restart_flag_file, "w") as f:
-                    f.write("restart")
+                    f.write(restart_text)
                 LOGGER.info("Created restart flag file to signal app reboot")
 
-                # The test runner will automatically wait for the app-ready-pattern before continuing
-
-                # Expire sessions and re-establish connections
+                # Expire sessions before the monitor picks up the flag
                 self._expire_sessions_on_all_controllers()
-                LOGGER.info("App restart completed successfully")
+
+                await self.wait_for_restart_flag_file_removal(restart_flag_file, restart_text)
+
+                LOGGER.info("App reboot completed successfully")
 
             except Exception as e:
                 LOGGER.error(f"Failed to reboot app: {e}")
                 asserts.fail(f"App reboot failed: {e}")
 
-    async def request_device_factory_reset(self):
+    async def request_device_factory_reset(self, reset_ctrl: bool = False) -> None:
         """Request a factory reset of the Device Under Test (DUT).
 
-        This method handles factory resets in both CI and development environments (via run_python_test.py test runner script)
-        and also manual testing scenarios (via user input).
-        It will expire existing sessions to allow for controllers to reconnect to the DUT after the factory reset.
+        This method handles factory resets in both CI and development environments and also manual
+        testing scenarios (via user input). It expires existing sessions to allow for controllers
+        to reconnect to the DUT after the factory reset.
+
+        Args:
+            reset_ctrl (bool): If True, removes app, REPL configs, and controller config.
+                               If False, removes app and REPL configs but keeps controller config.
+                               Defaults to False.
+
+        Returns:
+            None
         """
-        # Check if restart flag file is available (indicates test runner supports app reboot)
+        # Check if restart flag file is available (indicates test runner supports app factory reset)
         restart_flag_file = self.get_restart_flag_file()
 
         if not restart_flag_file:
@@ -1542,21 +1555,33 @@ async def request_device_factory_reset(self):
             LOGGER.info("Manual device factory reset completed")
 
         else:
+            restart_flag_text = "factory reset" if reset_ctrl else "factory reset app only"
             try:
                 # Create the restart flag file to signal the test runner
                 with open(restart_flag_file, "w") as f:
-                    f.write("reset")
-                    LOGGER.info("Created restart flag file to signal app factory reset")
-
-                # The test runner will automatically wait for the app-ready-pattern before continuing
+                    f.write(restart_flag_text)
+                    LOGGER.info("Created restart flag file to signal %s request", restart_flag_text)
 
                 # Expire sessions and re-establish connections
                 self._expire_sessions_on_all_controllers()
-                LOGGER.info("App factory reset completed successfully")
+                LOGGER.info("%s request sent successfully", restart_flag_text.capitalize())
+
+                await self.wait_for_restart_flag_file_removal(restart_flag_file, restart_flag_text)
 
             except Exception as e:
-                LOGGER.error(f"Failed to factory reset app: {e}")
-                asserts.fail(f"App factory reset failed: {e}")
+                err = f"Failed to {restart_flag_text}: {e}"
+                LOGGER.error(err)
+                asserts.fail(err)
+
+    async def wait_for_restart_flag_file_removal(self, restart_flag_file, restart_flag_text, timeout_sec=30.0):
+        # Wait for the monitor thread to remove the flag file
+        # The monitor deletes the flag file AFTER the restart completes, so this ensures
+        # the app has fully rebooted and is ready before we continue
+        start_time = time.time()
+        while os.path.exists(restart_flag_file):
+            if time.time() - start_time > timeout_sec:
+                asserts.fail(f"App {restart_flag_text} did not complete within timeout (flag file still exists)")
+            await asyncio.sleep(0.1)
 
 
 def _async_runner(body, self: MatterBaseTest, *args, **kwargs):
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py b/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py
index fb3f93356e6..f40c421536c 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py
@@ -707,7 +707,7 @@ def populate_commissioning_args(args: argparse.Namespace, config) -> bool:
             return False
 
     wifi_args = ['ble-wifi', 'nfc-wifi']
-    thread_args = ['ble-thread', 'nfc-thread']
+    thread_args = ['ble-thread', 'nfc-thread', 'thread-meshcop']
     if commissioning_method in wifi_args:
         if args.wifi_ssid is None:
             print("error: missing --wifi-ssid <SSID> for --commissioning-method "
@@ -724,9 +724,15 @@ def populate_commissioning_args(args: argparse.Namespace, config) -> bool:
     elif commissioning_method in thread_args:
         if args.thread_dataset_hex is None:
             print("error: missing --thread-dataset-hex <DATASET_HEX> for --commissioning-method or "
-                  "--in-test-commissioning-method ble-thread or nfc-thread!")
+                  "--in-test-commissioning-method ble-thread, nfc-thread or thread-meshcop!")
             return False
         config.thread_operational_dataset = args.thread_dataset_hex
+        if commissioning_method == 'thread-meshcop':
+            if args.thread_ba_host is None or args.thread_ba_port is None:
+                print("error: missing --thread-ba-host or --thread-ba-port for --commissioning-method thread-meshcop!")
+                return False
+            config.thread_ba_host = args.thread_ba_host
+            config.thread_ba_port = args.thread_ba_port
     elif config.commissioning_method == "on-network-ip":
         if args.ip_addr is None:
             print("error: missing --ip-addr <IP_ADDRESS> for --commissioning-method on-network-ip")
@@ -826,6 +832,123 @@ def convert_args_to_matter_config(args: argparse.Namespace):
     return config
 
 
+def int_decimal_or_hex(s: str) -> int:
+    val = int(s, 0)
+    if val < 0:
+        raise ValueError("Negative values not supported")
+    return val
+
+
+def byte_string_from_hex(s: str) -> bytes:
+    return unhexlify(s.replace(":", "").replace(" ", "").replace("0x", ""))
+
+
+def str_from_manual_code(s: str) -> str:
+    """Enforces legal format for manual codes and removes spaces/dashes."""
+    s = s.replace("-", "").replace(" ", "")
+    regex = r"^([0-9]{11}|[0-9]{21})$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid manual code format, does not match %s" % regex)
+
+    return s
+
+
+def int_named_arg(s: str) -> Tuple[str, int]:
+    regex = r"^(?P<name>[a-zA-Z_0-9_.-]+):((?P<hex_value>0x[0-9a-fA-F_]+)|(?P<decimal_value>-?\d+))$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid int argument format, does not match %s" % regex)
+
+    name = match.group("name")
+    if match.group("hex_value"):
+        value = int(match.group("hex_value"), 0)
+    else:
+        value = int(match.group("decimal_value"), 10)
+    return (name, value)
+
+
+def str_named_arg(s: str) -> Tuple[str, str]:
+    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid string argument format, does not match %s" % regex)
+
+    return (match.group("name"), match.group("value"))
+
+
+def float_named_arg(s: str) -> Tuple[str, float]:
+    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid float argument format, does not match %s" % regex)
+
+    name = match.group("name")
+    value = float(match.group("value"))
+
+    return (name, value)
+
+
+def json_named_arg(s: str) -> Tuple[str, object]:
+    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid JSON argument format, does not match %s" % regex)
+
+    name = match.group("name")
+    value = json.loads(match.group("value"))
+
+    return (name, value)
+
+
+def bool_named_arg(s: str) -> Tuple[str, bool]:
+    regex = r"^(?P<name>[a-zA-Z_0-9.]+):((?P<truth_value>true|false)|(?P<decimal_value>[01]))$"
+    match = re.match(regex, s, re.IGNORECASE)
+    if not match:
+        raise ValueError("Invalid bool argument format, does not match %s" % regex)
+
+    name = match.group("name")
+    if match.group("truth_value"):
+        value = match.group("truth_value").lower() == "true"
+    else:
+        value = int(match.group("decimal_value")) != 0
+
+    return (name, value)
+
+
+def bytes_as_hex_named_arg(s: str) -> Tuple[str, bytes]:
+    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>[0-9a-fA-F:]+)$"
+    match = re.match(regex, s)
+    if not match:
+        raise ValueError("Invalid bytes as hex argument format, does not match %s" % regex)
+
+    name = match.group("name")
+    value_str = match.group("value")
+    value_str = value_str.replace(":", "")
+    if len(value_str) % 2 != 0:
+        raise ValueError("Byte string argument value needs to be event number of hex chars")
+    value = unhexlify(value_str)
+
+    return (name, value)
+
+
+def root_index(s: str) -> int:
+    CHIP_TOOL_COMPATIBILITY = {
+        "alpha": 1,
+        "beta": 2,
+        "gamma": 3
+    }
+
+    for name, id in CHIP_TOOL_COMPATIBILITY.items():
+        if s.lower() == name:
+            return id
+    else:
+        root_index = int(s)
+        if root_index == 0:
+            raise ValueError("Only support root index >= 1")
+        return root_index
+
+
 def parse_matter_test_args(argv: Optional[List[str]] = None):
     parser = argparse.ArgumentParser(description='Matter standalone Python test')
 
@@ -874,11 +997,11 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
 
     commission_group.add_argument('-m', '--commissioning-method', type=str,
                                   metavar='METHOD_NAME',
-                                  choices=["on-network", "ble-wifi", "ble-thread", "nfc-thread", "nfc-wifi"],
+                                  choices=["on-network", "ble-wifi", "ble-thread", "nfc-thread", "nfc-wifi", "thread-meshcop"],
                                   help='Name of commissioning method to use')
     commission_group.add_argument('--in-test-commissioning-method', type=str,
                                   metavar='METHOD_NAME',
-                                  choices=["on-network", "ble-wifi", "ble-thread", "nfc-thread", "nfc-wifi"],
+                                  choices=["on-network", "ble-wifi", "ble-thread", "nfc-thread", "nfc-wifi", "thread-meshcop"],
                                   help='Name of commissioning method to use, for commissioning tests')
     commission_group.add_argument('-d', '--discriminator', type=int_decimal_or_hex,
                                   metavar='LONG_DISCRIMINATOR',
@@ -908,6 +1031,10 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
     commission_group.add_argument('--case-admin-subject', action="store", type=int_decimal_or_hex,
                                   metavar="CASE_ADMIN_SUBJECT",
                                   help="Set the CASE admin subject to an explicit value (default to commissioner Node ID)")
+    commission_group.add_argument('--thread-ba-host', action="store", type=str,
+                                  help="Border Agent IP address")
+    commission_group.add_argument('--thread-ba-port', action="store", type=int,
+                                  help="Border Agent port")
 
     commission_group.add_argument('--commission-only', action="store_true", default=False,
                                   help="If true, test exits after commissioning without running subsequent tests")
@@ -956,120 +1083,3 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
         argv = sys.argv[1:]
 
     return convert_args_to_matter_config(parser.parse_args(argv))
-
-
-def int_decimal_or_hex(s: str) -> int:
-    val = int(s, 0)
-    if val < 0:
-        raise ValueError("Negative values not supported")
-    return val
-
-
-def byte_string_from_hex(s: str) -> bytes:
-    return unhexlify(s.replace(":", "").replace(" ", "").replace("0x", ""))
-
-
-def str_from_manual_code(s: str) -> str:
-    """Enforces legal format for manual codes and removes spaces/dashes."""
-    s = s.replace("-", "").replace(" ", "")
-    regex = r"^([0-9]{11}|[0-9]{21})$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid manual code format, does not match %s" % regex)
-
-    return s
-
-
-def int_named_arg(s: str) -> Tuple[str, int]:
-    regex = r"^(?P<name>[a-zA-Z_0-9_.-]+):((?P<hex_value>0x[0-9a-fA-F_]+)|(?P<decimal_value>-?\d+))$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid int argument format, does not match %s" % regex)
-
-    name = match.group("name")
-    if match.group("hex_value"):
-        value = int(match.group("hex_value"), 0)
-    else:
-        value = int(match.group("decimal_value"), 10)
-    return (name, value)
-
-
-def str_named_arg(s: str) -> Tuple[str, str]:
-    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid string argument format, does not match %s" % regex)
-
-    return (match.group("name"), match.group("value"))
-
-
-def float_named_arg(s: str) -> Tuple[str, float]:
-    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid float argument format, does not match %s" % regex)
-
-    name = match.group("name")
-    value = float(match.group("value"))
-
-    return (name, value)
-
-
-def json_named_arg(s: str) -> Tuple[str, object]:
-    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>.*)$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid JSON argument format, does not match %s" % regex)
-
-    name = match.group("name")
-    value = json.loads(match.group("value"))
-
-    return (name, value)
-
-
-def bool_named_arg(s: str) -> Tuple[str, bool]:
-    regex = r"^(?P<name>[a-zA-Z_0-9.]+):((?P<truth_value>true|false)|(?P<decimal_value>[01]))$"
-    match = re.match(regex, s, re.IGNORECASE)
-    if not match:
-        raise ValueError("Invalid bool argument format, does not match %s" % regex)
-
-    name = match.group("name")
-    if match.group("truth_value"):
-        value = match.group("truth_value").lower() == "true"
-    else:
-        value = int(match.group("decimal_value")) != 0
-
-    return (name, value)
-
-
-def bytes_as_hex_named_arg(s: str) -> Tuple[str, bytes]:
-    regex = r"^(?P<name>[a-zA-Z_0-9.]+):(?P<value>[0-9a-fA-F:]+)$"
-    match = re.match(regex, s)
-    if not match:
-        raise ValueError("Invalid bytes as hex argument format, does not match %s" % regex)
-
-    name = match.group("name")
-    value_str = match.group("value")
-    value_str = value_str.replace(":", "")
-    if len(value_str) % 2 != 0:
-        raise ValueError("Byte string argument value needs to be event number of hex chars")
-    value = unhexlify(value_str)
-
-    return (name, value)
-
-
-def root_index(s: str) -> int:
-    CHIP_TOOL_COMPATIBILITY = {
-        "alpha": 1,
-        "beta": 2,
-        "gamma": 3
-    }
-
-    for name, id in CHIP_TOOL_COMPATIBILITY.items():
-        if s.lower() == name:
-            return id
-    else:
-        root_index = int(s)
-        if root_index == 0:
-            raise ValueError("Only support root index >= 1")
-        return root_index
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/spec_parsing.py b/src/python_testing/matter_testing_infrastructure/matter/testing/spec_parsing.py
index 6b217832787..1532b877b0c 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/spec_parsing.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/spec_parsing.py
@@ -27,7 +27,7 @@
 from copy import deepcopy
 from dataclasses import dataclass, field
 from enum import Enum, StrEnum, auto
-from importlib.abc import Traversable
+from importlib.resources.abc import Traversable
 from typing import Optional, Union
 
 import matter.clusters as Clusters
@@ -943,6 +943,7 @@ class PrebuiltDataModelDirectory(Enum):
     k1_4_2 = auto()
     k1_5 = auto()
     k1_5_1 = auto()
+    k1_6 = auto()
 
     @property
     def dirname(self):
@@ -960,6 +961,8 @@ def dirname(self):
             return "1.5"
         if self == PrebuiltDataModelDirectory.k1_5_1:
             return "1.5.1"
+        if self == PrebuiltDataModelDirectory.k1_6:
+            return "1.6"
         raise KeyError("Invalid enum: %r" % self)
 
 
@@ -1681,6 +1684,7 @@ def dm_from_spec_version(specification_version: uint) -> PrebuiltDataModelDirect
         0x01040200: PrebuiltDataModelDirectory.k1_4_2,
         0x01050000: PrebuiltDataModelDirectory.k1_5,
         0x01050100: PrebuiltDataModelDirectory.k1_5_1,
+        0x01060000: PrebuiltDataModelDirectory.k1_6,
     }
 
     if specification_version not in version_to_dm:
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/tasks.py b/src/python_testing/matter_testing_infrastructure/matter/testing/tasks.py
index f8c6ec4267b..09c4ad7453f 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/tasks.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/tasks.py
@@ -172,7 +172,17 @@ def send(self, message: str, end: str = "\n",
 
     def terminate(self):
         """Terminate the subprocess and wait for it to finish."""
+        import time
+
         self.p.terminate()
+
+        # WORKAROUND: Give kernel time to complete socket cleanup after SIGTERM.
+        # Rapid test succession can cause "Address already in use" errors when processes
+        # exit so quickly that the kernel hasn't finished releasing TCP ports (especially
+        # with optimized shutdown paths like idempotent cleanup patterns).
+        # This ensures the port is fully released before the next test starts.
+        time.sleep(2)
+
         self.join()
 
     def wait(self, timeout: Optional[float] = None) -> Optional[int]:
diff --git a/src/python_testing/provisional/TC_SC_TC_4_1.py b/src/python_testing/provisional/TC_SC_TC_4_1.py
new file mode 100644
index 00000000000..f9f17f58b54
--- /dev/null
+++ b/src/python_testing/provisional/TC_SC_TC_4_1.py
@@ -0,0 +1,67 @@
+#
+#    Copyright (c) 2025 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.
+
+
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_CLUSTERS_APP}
+#     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method thread-meshcop
+#       --discriminator 1234
+#       --passcode 20202021
+#       --thread-ba-host 127.0.0.1
+#       --thread-ba-port 49152
+#       --thread-dataset-hex 0e08000000000001000000030000104a0300001635060004001fffe0020884fa18779329ac770708fd269658e44aa21a030f4f70656e5468726561642d32386335010228c50c0402a0f7f8051000112233445566778899aabbccddeeff041000112233445566778899aabbccddeeff
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+
+from matter import ChipDeviceCtrl
+from matter.testing.decorators import async_test_body
+from matter.testing.matter_testing import MatterBaseTest, TestStep
+from matter.testing.runner import default_matter_test_main
+
+log = logging.getLogger(__name__)
+
+
+class TC_SC_TC_4_1(MatterBaseTest):
+    def desc_TC_SC_TC_4_1(self) -> str:
+        return "[TC-SC-TC-4.1] Message Framing and PASE Session Establishment [DUT – Commissionee]"
+
+    def steps_TC_SC_TC_4_1(self) -> list[TestStep]:
+        return [
+            TestStep(1, "Commissioner petitions the Thread Border Agent to become the Thread Commissioner with a 12-bit discriminator"),
+            TestStep(2, 'Validate the discriminator and perform the commissioning')
+        ]
+
+    @async_test_body
+    async def test_TC_SC_TC_4_1(self):
+        commissioner: ChipDeviceCtrl.ChipDeviceController = self.default_controller
+        self.step(1)
+        commissioner.SetSkipCommissioningComplete(True)
+        self.step(2)
+        await self.commission_devices()
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/test_metadata.yaml b/src/python_testing/test_metadata.yaml
index 3ea12d064eb..25a88d1dfab 100644
--- a/src/python_testing/test_metadata.yaml
+++ b/src/python_testing/test_metadata.yaml
@@ -13,22 +13,6 @@ not_automated:
       reason: Code/Test not being used or not shared code for any other tests
     - name: TC_AVSMTestBase.py
       reason: Shared code for TC_AVSM, not a standalone test
-    - name: TC_AVSM_2_18.py
-      reason:
-          AVSM flaky test in CI.
-          https://github.com/project-chip/connectedhomeip/issues/42871
-    - name: TC_AVSM_2_19.py
-      reason:
-          AVSM flaky test in CI.
-          https://github.com/project-chip/connectedhomeip/issues/42871
-    - name: TC_AVSM_2_20.py
-      reason:
-          AVSM flaky test in CI.
-          https://github.com/project-chip/connectedhomeip/issues/42871
-    - name: TC_AVSM_2_21.py
-      reason:
-          AVSM flaky test in CI.
-          https://github.com/project-chip/connectedhomeip/issues/42871
     - name: TC_BRBINFO_3_1.py
       reason:
           Attribute is not implemented in the bridge app. Same code as
@@ -95,6 +79,10 @@ not_automated:
       reason: Shared code for TC_SU, not a standalone test
     - name: TC_SU_2_2.py
       reason: Test takes around 10 minutes, skipped in CI. Works on CI if added.
+    - name: TC_SU_2_5.py
+      reason:
+          Test is skipped as it takes around 25 minutes to complete. Works on CI
+          if added.
     - name: TC_SU_2_7.py
       reason:
           Test is skipped as it takes around 15 minutes to complete. Works on CI
@@ -186,34 +174,12 @@ not_automated:
           onboarding data security requirements)
     - name: TC_GCAST_common.py
       reason: Shared code for TC_GCAST, not a standalone test.
-    - name: TC_GCAST_2_1.py
+    - name: TC_GCAST_2_2.py
       reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
-    - name: TC_GCAST_2_3.py
-      reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
-    - name: TC_GCAST_2_4.py
-      reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
-    - name: TC_GCAST_2_5.py
-      reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
-    - name: TC_GCAST_2_6.py
-      reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
+          Test fails in REPL Tests - Linux CI environment because report
+          chunking is not enabled.
     - name: TC_GCAST_2_7.py
-      reason:
-          Cluster not finalized. Will re-enable before 1.6TE2. CI is not
-          supported.
-    - name: TC_ACL_2_10.py
-      reason:
-          Flaky, see
-          https://github.com/project-chip/connectedhomeip/issues/43056
+      reason: Does not currently pass.
 
 # This is a list of slow tests (just arbitrarily picked around 20 seconds)
 # used in some script reporting for "be patient" messages as well as potentially
@@ -234,6 +200,7 @@ slow_tests:
     - { name: TC_DRLK_2_3.py, duration: 30 seconds }
     - { name: TC_EEVSE_2_6.py, duration: 30 seconds }
     - { name: TC_FAN_3_1.py, duration: 15 seconds }
+    - { name: TC_JFPKI_2_4.py, duration: 5 minutes }
     - { name: TC_MCORE_FS_1_4.py, duration: 20 seconds }
     - { name: TC_OPSTATE_2_5.py, duration: 1.25 minutes }
     - { name: TC_OPSTATE_2_6.py, duration: 35 seconds }
diff --git a/src/python_testing/test_testing/DeviceConformanceTests.py b/src/python_testing/test_testing/DeviceConformanceTests.py
index 73cf64a73f2..241e6ee866d 100644
--- a/src/python_testing/test_testing/DeviceConformanceTests.py
+++ b/src/python_testing/test_testing/DeviceConformanceTests.py
@@ -123,7 +123,10 @@ def record_warning(location, problem):
         ignore_attributes: dict[int, list[int]] = {}
         if ignore_in_progress:
             # This is a manually curated list of attributes that are in-progress in the SDK, but have landed in the spec
-            in_progress_attributes = {Clusters.ThreadNetworkDiagnostics.id: [0x3F, 0x40]}
+            in_progress_attributes = {
+                Clusters.ThreadNetworkDiagnostics.id: [0x3F, 0x40],
+                Clusters.BasicInformation.id: [0x18],
+            }
             ignore_attributes.update(in_progress_attributes)
 
         if is_ci:
@@ -133,6 +136,17 @@ def record_warning(location, problem):
                 Clusters.NetworkCommissioning.Attributes.ScanMaxTimeSeconds.attribute_id, Clusters.NetworkCommissioning.Attributes.ConnectMaxTimeSeconds.attribute_id]}
             ignore_attributes.update(ci_ignore_attributes)
 
+        ignore_feature_masks: dict[int, list[int]] = {}
+        if ignore_in_progress:
+            # This is a manually curated list of features that are in-progress in the SDK, but have landed in the spec
+            in_progress_features = {}
+            ignore_feature_masks.update(in_progress_features)
+
+        if is_ci:
+            # This is a manually curated list of features that are present in the SDK, but not in the spec.
+            ci_ignore_features = {}
+            ignore_feature_masks.update(ci_ignore_features)
+
         success = True
         provisional_cluster_ids = []
         # TODO: Remove this once we have a scrape without items not going to the test events
@@ -169,6 +183,9 @@ def record_warning(location, problem):
                                                  attribute_id=GlobalAttributeIds.FEATURE_MAP_ID)
                 feature_masks = [1 << i for i in range(32) if feature_map & (1 << i)]
                 for f in feature_masks:
+                    if cluster_id in ignore_feature_masks and f in ignore_feature_masks[cluster_id]:
+                        continue
+
                     if cluster_id == Clusters.AccessControl.id and f == Clusters.AccessControl.Bitmaps.Feature.kManagedDevice:
                         # Managed ACL is treated as a special case because it is only allowed if other endpoints support NIM and disallowed otherwise.
                         if not self._has_device_type_supporting_macl():
diff --git a/src/python_testing/test_testing/TestFactoryResetRequests.py b/src/python_testing/test_testing/TestFactoryResetRequests.py
new file mode 100644
index 00000000000..91ea0f15f96
--- /dev/null
+++ b/src/python_testing/test_testing/TestFactoryResetRequests.py
@@ -0,0 +1,94 @@
+#
+#    Copyright (c) 2026 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.
+#
+
+# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments
+# for details about the block below.
+
+# === BEGIN CI TEST ARGUMENTS ===
+# test-runner-runs:
+#   run1:
+#     app: ${ALL_CLUSTERS_APP}
+#     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
+#     app-ready-pattern: "APP STATUS: Starting event loop"
+#     script-args: >
+#       --storage-path admin_storage.json
+#       --commissioning-method on-network
+#       --discriminator 1234
+#       --passcode 20202021
+#       --endpoint 1
+#       --trace-to json:${TRACE_TEST_JSON}.json
+#       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
+#     factory-reset: true
+#     quiet: true
+# === END CI TEST ARGUMENTS ===
+
+import logging
+
+from matter import ChipDeviceCtrl
+from matter.testing.commissioning import SetupParameters
+from matter.testing.decorators import async_test_body
+from matter.testing.matter_testing import MatterBaseTest
+from matter.testing.runner import default_matter_test_main
+
+logger = logging.getLogger(__name__)
+
+
+class TestFactoryResetRequests(MatterBaseTest):
+
+    def desc_TestFactoryResetRequests(self) -> str:
+        return "[TestFactoryResetRequests] Test Factory Reset Requests"
+
+    def get_new_controller(self) -> ChipDeviceCtrl.ChipDeviceController:
+        new_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
+        new_fabric_admin = new_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=self.matter_test_config.fabric_id + 1)
+        return new_fabric_admin.NewController(paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path))
+
+    async def factory_reset_and_pase(self, setup_params: SetupParameters, pase_node_id: int, reset_ctrl: bool):
+        # Get a new controller
+        th2 = self.get_new_controller()
+
+        # Request factory reset
+        await self.request_device_factory_reset(reset_ctrl=reset_ctrl)
+
+        # Open a PASE session
+        await th2.FindOrEstablishPASESession(
+            setupCode=setup_params.qr_code,
+            nodeId=pase_node_id
+        )
+
+    @async_test_body
+    async def test_TestFactoryResetRequests(self):
+        pase_node_id = self.dut_node_id + 1
+        setup_params = SetupParameters(
+            discriminator=1234,
+            passcode=20202021
+        )
+
+        logger.info("\n\n\t** Testing 'Factory Reset App Only' Back to Back **\n")
+        await self.factory_reset_and_pase(setup_params=setup_params, pase_node_id=pase_node_id, reset_ctrl=False)
+        await self.factory_reset_and_pase(setup_params=setup_params, pase_node_id=pase_node_id, reset_ctrl=False)
+
+        logger.info("\n\n\t** Testing previous 'Factory Reset App Only' followed by a Back to Back 'Factory Reset' **\n")
+        await self.factory_reset_and_pase(setup_params=setup_params, pase_node_id=pase_node_id, reset_ctrl=True)
+        await self.factory_reset_and_pase(setup_params=setup_params, pase_node_id=pase_node_id, reset_ctrl=True)
+
+        logger.info("\n\n\t** Testing previous 'Factory Reset' followed by a 'Factory Reset App Only' **\n")
+        await self.factory_reset_and_pase(setup_params=setup_params, pase_node_id=pase_node_id, reset_ctrl=False)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/test_testing/TestSpecParsingDataType.py b/src/python_testing/test_testing/TestSpecParsingDataType.py
index 88fb63a0aa9..9188bde8506 100644
--- a/src/python_testing/test_testing/TestSpecParsingDataType.py
+++ b/src/python_testing/test_testing/TestSpecParsingDataType.py
@@ -32,8 +32,8 @@
 
 class TestSpecParsingDataType(MatterBaseTest):
     def setup_class(self):
-        self.xml_clusters, self.xml_cluster_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_5)
-        self.xml_global_data_types, self.xml_global_problems = build_xml_global_data_types(PrebuiltDataModelDirectory.k1_5)
+        self.xml_clusters, self.xml_cluster_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_6)
+        self.xml_global_data_types, self.xml_global_problems = build_xml_global_data_types(PrebuiltDataModelDirectory.k1_6)
 
         # Setup templates for testing struct, enum, and bitmap data types
         self.cluster_id = 0xABCD
@@ -701,6 +701,7 @@ def test_spec_data_type_files(self):
         one_four_one, _ = build_xml_clusters(PrebuiltDataModelDirectory.k1_4_1)
         one_four_two, _ = build_xml_clusters(PrebuiltDataModelDirectory.k1_4_2)
         one_five, _ = build_xml_clusters(PrebuiltDataModelDirectory.k1_5)
+        one_six, _ = build_xml_clusters(PrebuiltDataModelDirectory.k1_6)
 
         # Sample cluster ID to check for data types (Basic Information)
         cluster_id = uint(Clusters.BasicInformation.id)
@@ -711,6 +712,7 @@ def test_spec_data_type_files(self):
         asserts.assert_true(cluster_id in one_four_one, "Basic Information cluster not found in 1.4.1")
         asserts.assert_true(cluster_id in one_four_two, "Basic Information cluster not found in 1.4.2")
         asserts.assert_true(cluster_id in one_five, "Basic Information cluster not found in 1.5")
+        asserts.assert_true(cluster_id in one_six, "Basic Information cluster not found in 1.6")
 
         # Compare struct counts (should generally increase or stay the same over versions)
         asserts.assert_less_equal(len(one_three[cluster_id].structs), len(one_five[cluster_id].structs),
@@ -721,6 +723,8 @@ def test_spec_data_type_files(self):
                                   "1.5 should have at least as many structs as 1.4.1")
         asserts.assert_less_equal(len(one_four_two[cluster_id].structs), len(one_five[cluster_id].structs),
                                   "1.5 should have at least as many structs as 1.4.2")
+        asserts.assert_less_equal(len(one_five[cluster_id].structs), len(one_six[cluster_id].structs),
+                                  "1.6 should have at least as many structs as 1.5")
 
     def test_find_complex_bitmaps(self):
         """Find and test bitmaps with multi-bit fields in the data model"""
diff --git a/src/python_testing/test_testing/TestSpecParsingDeviceType.py b/src/python_testing/test_testing/TestSpecParsingDeviceType.py
index da64d7d5240..83aa7da2f1e 100644
--- a/src/python_testing/test_testing/TestSpecParsingDeviceType.py
+++ b/src/python_testing/test_testing/TestSpecParsingDeviceType.py
@@ -463,6 +463,7 @@ def test_spec_files(self):
         one_four_two, one_four_two_problems = build_xml_device_types(PrebuiltDataModelDirectory.k1_4_2)
         one_five, one_five_problems = build_xml_device_types(PrebuiltDataModelDirectory.k1_5)
         one_five_one, one_five_one_problems = build_xml_device_types(PrebuiltDataModelDirectory.k1_5_1)
+        one_six, one_six_problems = build_xml_device_types(PrebuiltDataModelDirectory.k1_6)
         self.problems.extend(one_two_problems)
         self.problems.extend(one_three_problems)
         self.problems.extend(one_four_problems)
@@ -470,6 +471,7 @@ def test_spec_files(self):
         self.problems.extend(one_four_two_problems)
         self.problems.extend(one_five_problems)
         self.problems.extend(one_five_one_problems)
+        self.problems.extend(one_six_problems)
 
         asserts.assert_equal(len(one_two_problems), 0, "Problems found when parsing 1.2 spec")
         asserts.assert_equal(len(one_three_problems), 0, "Problems found when parsing 1.3 spec")
@@ -478,6 +480,7 @@ def test_spec_files(self):
         asserts.assert_equal(len(one_four_two_problems), 0, "Problems found when parsing 1.4.2 spec")
         asserts.assert_equal(len(one_five_problems), 0, "Problems found when parsing 1.5 spec")
         asserts.assert_equal(len(one_five_one_problems), 0, "Problems found when parsing 1.5.1 spec")
+        asserts.assert_equal(len(one_six_problems), 0, "Problems found when parsing 1.6 spec")
 
         # Current ballot has a bunch of problems related to IDs being allocated for closures and TBR. These should all
         # mention ID-TBD as the id, so let's pull those out for now and make sure there are no UNKNOWN problems.
@@ -511,6 +514,8 @@ def test_spec_files(self):
                              set(), "There are some 1.4.2 device types that are unexpectedly not included in the 1.5 spec")
         asserts.assert_equal(set(one_five.keys())-set(one_five_one.keys()),
                              set(), "There are some 1.5 device types that are unexpectedly not included in the 1.5.1 spec")
+        asserts.assert_equal(set(one_five_one.keys())-set(one_six.keys()),
+                             set(), "There are some 1.5.1 device types that are unexpectedly not included in the 1.6 spec")
 
     @run_against_all_spec_revisions
     def test_application_device_type_on_root(self):
diff --git a/src/python_testing/test_testing/TestSpecParsingNamespace.py b/src/python_testing/test_testing/TestSpecParsingNamespace.py
index 2083091095f..0c82c9febc8 100644
--- a/src/python_testing/test_testing/TestSpecParsingNamespace.py
+++ b/src/python_testing/test_testing/TestSpecParsingNamespace.py
@@ -17,7 +17,7 @@
 
 import xml.etree.ElementTree as ElementTree
 import zipfile
-from importlib.abc import Traversable
+from importlib.resources.abc import Traversable
 
 from jinja2 import Template
 from mobly import asserts
@@ -227,12 +227,14 @@ def test_spec_files(self):
         one_four_one, one_four_one_problems = build_xml_namespaces(PrebuiltDataModelDirectory.k1_4_1)
         one_four_two, one_four_two_problems = build_xml_namespaces(PrebuiltDataModelDirectory.k1_4_2)
         one_five, one_five_problems = build_xml_namespaces(PrebuiltDataModelDirectory.k1_5)
+        one_six, one_six_problems = build_xml_namespaces(PrebuiltDataModelDirectory.k1_6)
 
         asserts.assert_equal(len(one_three_problems), 0, "Problems found when parsing 1.3 spec")
         asserts.assert_equal(len(one_four_problems), 0, "Problems found when parsing 1.4 spec")
         asserts.assert_equal(len(one_four_one_problems), 0, "Problems found when parsing 1.4.1 spec")
         asserts.assert_equal(len(one_four_two_problems), 0, "Problems found when parsing 1.4.2 spec")
         asserts.assert_equal(len(one_five_problems), 0, "Problems found when parsing 1.5 spec")
+        asserts.assert_equal(len(one_six_problems), 0, "Problems found when parsing 1.6 spec")
 
         # Check version relationships
         asserts.assert_greater(len(set(one_five.keys()) - set(one_three.keys())),
@@ -243,6 +245,8 @@ def test_spec_files(self):
                                0, "1.5 dir contains less namespaces than 1.4.1")
         asserts.assert_greater(len(set(one_five.keys()) - set(one_four_two.keys())),
                                0, "1.5 dir contains less namespaces than 1.4.2")
+        asserts.assert_greater(len(set(one_six.keys()) - set(one_five.keys())),
+                               0, "1.6 dir contains less namespaces than 1.5")
 
         # Complete namespace version checks for 1.3, 1.4, 1.4.1, 1.4.2, 1.5, known differences and relationships:
         # 1.3: has Common Position
diff --git a/src/python_testing/test_testing/TestSpecParsingSelection.py b/src/python_testing/test_testing/TestSpecParsingSelection.py
index 1ef65e87b8e..eb8b4d71d75 100644
--- a/src/python_testing/test_testing/TestSpecParsingSelection.py
+++ b/src/python_testing/test_testing/TestSpecParsingSelection.py
@@ -52,6 +52,8 @@ def test_dm_from_spec_version(self):
                              "Incorrect directory selected for 1.5")
         asserts.assert_equal(dm_from_spec_version(0x01050100), PrebuiltDataModelDirectory.k1_5_1,
                              "Incorrect directory selected for 1.5.1")
+        asserts.assert_equal(dm_from_spec_version(0x01060000), PrebuiltDataModelDirectory.k1_6,
+                             "Incorrect directory selected for 1.6")
 
         # 1.2 doesn't include a specification revision field, so this should error
         with asserts.assert_raises(ConformanceException, "Expected assertion was not raised for spec version 1.2"):
@@ -79,6 +81,8 @@ def test_dm_from_spec_version(self):
             dm_from_spec_version(0x01040101)
         with asserts.assert_raises(ConformanceException, "Error not returned for specification revision with non-zero reserved values"):
             dm_from_spec_version(0x01050001)
+        with asserts.assert_raises(ConformanceException, "Error not returned for specification revision with non-zero reserved values"):
+            dm_from_spec_version(0x01060001)
 
     def _create_device(self, spec_version: uint, tc_enabled: bool):
         if spec_version is None:
diff --git a/src/python_testing/test_testing/TestSpecParsingSupport.py b/src/python_testing/test_testing/TestSpecParsingSupport.py
index e786fc9d448..ede0410ee2a 100644
--- a/src/python_testing/test_testing/TestSpecParsingSupport.py
+++ b/src/python_testing/test_testing/TestSpecParsingSupport.py
@@ -278,6 +278,7 @@ def test_build_xml_override(self):
         one_four_two_xml_clusters, one_four_two_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_4_2)
         one_five_xml_clusters, one_five_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_5)
         one_five_one_xml_clusters, one_five_one_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_5_1)
+        one_six_xml_clusters, one_six_problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_6)
 
         # We know 1.2, 1.3, 1.4 and 1.4.1, 1.4.2 are clear of errors, ensure it stays that way.
         asserts.assert_equal(len(one_two_problems), 0, "Unexpected problems found on 1.2 cluster parsing")
@@ -290,7 +291,10 @@ def test_build_xml_override(self):
         asserts.assert_equal(len(one_five_problems), 0, "Unexpected problems found on 1.5 cluster parsing")
         for p in one_five_one_problems:
             print(p)
-        asserts.assert_equal(len(one_five_problems), 0, "Unexpected problems found on 1.5.1 cluster parsing")
+        asserts.assert_equal(len(one_five_one_problems), 0, "Unexpected problems found on 1.5.1 cluster parsing")
+        for p in one_six_problems:
+            print(p)
+        asserts.assert_equal(len(one_six_problems), 0, "Unexpected problems found on 1.6 cluster parsing")
 
         asserts.assert_greater(len(set(one_four_two_xml_clusters.keys()) - set(one_two_clusters.keys())),
                                0, "1.2.2 dir does not contain any clusters not in 1.3")
@@ -306,6 +310,8 @@ def test_build_xml_override(self):
                                0, "1.5 dir does not contain any clusters not in 1.4.2")
         asserts.assert_greater_equal(len(set(one_five_one_xml_clusters.keys()) - set(one_five_xml_clusters.keys())),
                                      0, "1.5.1 has fewer clusters than 1.5")
+        asserts.assert_greater_equal(len(set(one_six_xml_clusters.keys()) - set(one_five_one_xml_clusters.keys())),
+                                     0, "1.6 has fewer clusters than 1.5.1")
 
         # The following clusters were removed in 1.3: Scenes, Leaf Wetness Measurement, Soil Moisture Measurement
         one_two_removed = {0x0005, 0x0407, 0x0408}
diff --git a/src/python_testing/test_testing/fake_device_builder.py b/src/python_testing/test_testing/fake_device_builder.py
index 42ff1f2c13f..80d670f195d 100644
--- a/src/python_testing/test_testing/fake_device_builder.py
+++ b/src/python_testing/test_testing/fake_device_builder.py
@@ -102,11 +102,11 @@ def create_minimal_dt(xml_clusters: dict[uint, XmlCluster], xml_device_types: di
         additional_commands = []
         if apply_dt_element_overrides and s in mandatory_servers:
             additional_features = [id for id, conformance in xml_device_types[device_type_id]
-                                   .server_clusters[s].feature_overrides.items() if _is_mandatory(conformance)]
+                                   .server_clusters[s].feature_overrides.items() if _is_mandatory(conformance, revision=device_type_revision)]
             additional_attributes = [id for id, conformance in xml_device_types[device_type_id]
-                                     .server_clusters[s].attribute_overrides.items() if _is_mandatory(conformance)]
+                                     .server_clusters[s].attribute_overrides.items() if _is_mandatory(conformance, revision=device_type_revision)]
             additional_commands = [id for id, conformance in xml_device_types[device_type_id]
-                                   .server_clusters[s].command_overrides.items() if _is_mandatory(conformance)]
+                                   .server_clusters[s].command_overrides.items() if _is_mandatory(conformance, revision=device_type_revision)]
         endpoint[s if is_tlv_endpoint else Clusters.ClusterObjects.ALL_CLUSTERS[s]
                  ] = create_minimal_cluster(xml_clusters, s, is_tlv_endpoint, additional_features=additional_features, additional_attributes=additional_attributes, additional_commands=additional_commands)
 
diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
index 70ee0df6e59..5887a99ad3d 100644
--- a/src/system/SystemConfig.h
+++ b/src/system/SystemConfig.h
@@ -176,6 +176,19 @@
 #undef SUCCESS
 #endif
 #include <lwip/opt.h>
+
+// TODO: this is an awkward workaround for some platforms (AmebaD - platform_stdlib_rtl8721d)
+// defining false as 0, resulting in casting `inconsistent types/ bool and int` errors for
+// lambda argument deduction.
+//
+// Currently this happens as an inclusion of `lwip/opt.h`, so the undefine is added in this header
+#ifdef false
+#undef false
+#endif
+#ifdef true
+#undef true
+#endif
+
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 /* Configuration option variables defined below */
diff --git a/src/system/SystemError.cpp b/src/system/SystemError.cpp
index 34bd5ed32f3..b01c4eb703a 100644
--- a/src/system/SystemError.cpp
+++ b/src/system/SystemError.cpp
@@ -91,7 +91,7 @@ DLL_EXPORT const char * DescribeErrorPOSIX(CHIP_ERROR aError)
 #endif // CHIP_SYSTEM_CONFIG_THREAD_LOCAL_STORAGE
 
     // Use thread-safe strerror_r when available
-#if defined(_GNU_SOURCE) && !defined(__ANDROID__)
+#if defined(_GNU_SOURCE) && !defined(__ANDROID__) && !defined(__Fuchsia__) && !defined(__MUSL__)
     // GNU version returns char*
     const char * s = strerror_r(lError, errBuf, sizeof(errBuf));
     if (s != nullptr)
diff --git a/src/test_driver/nrfconnect/CMakeLists.txt b/src/test_driver/nrfconnect/CMakeLists.txt
index 274633ef35f..901b6b9ebba 100644
--- a/src/test_driver/nrfconnect/CMakeLists.txt
+++ b/src/test_driver/nrfconnect/CMakeLists.txt
@@ -46,12 +46,17 @@ set(CHIP_CFLAGS
 
 # Load NCS/Zephyr build system
 list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
+list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/third_party/pigweed/repo)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 
-set(CONFIG_ZEPHYR_PIGWEED_MODULE 1)
-set(CONFIG_PIGWEED_ASSERT 1)
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-add_subdirectory(${PIGWEED_ROOT} "${CMAKE_BINARY_DIR}/pigweed")
+# ==================================================
+# Setup Pigweed
+# ==================================================
+
+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.zephyr)
 
 # ==================================================
 # Build 'all tests' runner
diff --git a/src/test_driver/nrfconnect/prj.conf b/src/test_driver/nrfconnect/prj.conf
index 141239da8ef..c9a2d462748 100644
--- a/src/test_driver/nrfconnect/prj.conf
+++ b/src/test_driver/nrfconnect/prj.conf
@@ -93,3 +93,6 @@ CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS=n
 # Use default ICD poll intervals to keep compatibility with tests
 CONFIG_CHIP_ICD_SLOW_POLL_INTERVAL=5000
 CONFIG_CHIP_ICD_FAST_POLLING_INTERVAL=200
+
+# Enable system I/O module
+CONFIG_PIGWEED_SYS_IO=y
diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
index 4bbb136b1fd..5e191175b04 100644
--- a/src/transport/SessionManager.cpp
+++ b/src/transport/SessionManager.cpp
@@ -224,7 +224,11 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P
             return CHIP_ERROR_INTERNAL;
         }
 
-        destination_address = Transport::PeerAddress::Multicast(fabric->GetFabricId(), groupSession->GetGroupId());
+        Credentials::GroupDataProvider::GroupInfo info;
+        ReturnErrorOnFailure(groups->GetGroupInfo(groupSession->GetFabricIndex(), groupSession->GetGroupId(), info));
+        destination_address = (info.UsePerGroupAddress())
+            ? Transport::PeerAddress::Multicast(fabric->GetFabricId(), groupSession->GetGroupId())
+            : Transport::PeerAddress::Groupcast();
 
         Crypto::SymmetricKeyContext * keyContext =
             groups->GetKeyContext(groupSession->GetFabricIndex(), groupSession->GetGroupId());
@@ -420,8 +424,14 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand
 
         const FabricInfo * fabric = mFabricTable->FindFabricWithIndex(groupSession->GetFabricIndex());
         VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+        auto * groups = Credentials::GetGroupDataProvider();
+        VerifyOrReturnError(nullptr != groups, CHIP_ERROR_INTERNAL);
 
-        multicastAddress = Transport::PeerAddress::Multicast(fabric->GetFabricId(), groupSession->GetGroupId());
+        Credentials::GroupDataProvider::GroupInfo info;
+        ReturnErrorOnFailure(groups->GetGroupInfo(groupSession->GetFabricIndex(), groupSession->GetGroupId(), info));
+        multicastAddress = (info.UsePerGroupAddress())
+            ? Transport::PeerAddress::Multicast(fabric->GetFabricId(), groupSession->GetGroupId())
+            : Transport::PeerAddress::Groupcast();
         destination      = &multicastAddress;
     }
     break;
diff --git a/src/transport/raw/PeerAddress.h b/src/transport/raw/PeerAddress.h
index 913d998f73d..d9f28ded46b 100644
--- a/src/transport/raw/PeerAddress.h
+++ b/src/transport/raw/PeerAddress.h
@@ -55,7 +55,8 @@ enum class Type : uint8_t
     kTcp,
     kWiFiPAF,
     kNfc,
-    kLast = kNfc, // This is not an actual transport type, it just refers to the last transport type
+    kThreadMeshcop,
+    kLast = kThreadMeshcop, // This is not an actual transport type, it just refers to the last transport type
 };
 
 /**
@@ -183,6 +184,15 @@ class PeerAddress
         case Type::kNfc:
             snprintf(buf, bufSize, "NFC:%d", mId.mNFCShortId);
             break;
+        case Type::kThreadMeshcop:
+            mIPAddress.ToString(ip_addr);
+#if INET_CONFIG_ENABLE_IPV4
+            if (mIPAddress.IsIPv4())
+                snprintf(buf, bufSize, "ThreadMeshcop:%s:%d", ip_addr, mPort);
+            else
+#endif
+                snprintf(buf, bufSize, "ThreadMeshcop:[%s]:%d", ip_addr, mPort);
+            break;
         default:
             snprintf(buf, bufSize, "ERROR");
             break;
@@ -199,6 +209,11 @@ class PeerAddress
     static constexpr PeerAddress NFC() { return PeerAddress(kUndefinedNFCShortId()); }
     static constexpr PeerAddress NFC(const uint16_t shortId) { return PeerAddress(shortId); }
 
+    static PeerAddress ThreadMeshcop(const Inet::IPAddress & addr, uint16_t port)
+    {
+        return PeerAddress(Type::kThreadMeshcop).SetIPAddress(addr).SetPort(port);
+    }
+
     static PeerAddress UDP(const Inet::IPAddress & addr) { return PeerAddress(addr, Type::kUdp); }
     static PeerAddress UDP(const Inet::IPAddress & addr, uint16_t port) { return UDP(addr).SetPort(port); }
 
diff --git a/src/wifipaf/WiFiPAFConfig.h b/src/wifipaf/WiFiPAFConfig.h
index a5ff830eefb..35f1794c831 100644
--- a/src/wifipaf/WiFiPAFConfig.h
+++ b/src/wifipaf/WiFiPAFConfig.h
@@ -97,10 +97,20 @@
 #define PAF_MAX_RECEIVE_WINDOW_SIZE 6
 #endif
 
-#if (PAF_MAX_RECEIVE_WINDOW_SIZE < 3)
-#error "PAF_MAX_RECEIVE_WINDOW_SIZE must be greater than 2 for PAF transport protocol stability."
+/**
+ * Minimum receive window for stability requirement
+ * The protocol in specification allows a minimum receive window of 2, since a peer must stop
+ * sending when the remote window has only one open slot left. To reduce the frequency of
+ * exception-handling cases, we raise the minimum to 3.
+ */
+#ifndef PAF_MIN_RECEIVE_WINDOW_SIZE
+#define PAF_MIN_RECEIVE_WINDOW_SIZE 3
 #endif
 
+static_assert(
+    PAF_MAX_RECEIVE_WINDOW_SIZE >= PAF_MIN_RECEIVE_WINDOW_SIZE,
+    "PAF_MAX_RECEIVE_WINDOW_SIZE must not be smaller than PAF_MIN_RECEIVE_WINDOW_SIZE for PAF transport protocol stability.");
+
 /**
  * @def PAFTP_CONN_RSP_TIMEOUT_MS
  *
diff --git a/src/wifipaf/WiFiPAFEndPoint.cpp b/src/wifipaf/WiFiPAFEndPoint.cpp
index 3ee6779e82b..b689bd6cfd2 100644
--- a/src/wifipaf/WiFiPAFEndPoint.cpp
+++ b/src/wifipaf/WiFiPAFEndPoint.cpp
@@ -187,12 +187,12 @@ void WiFiPAFEndPoint::DoClose(uint8_t flags, CHIP_ERROR err)
         // Free the packets in re-order queue if ones exist
         for (uint8_t qidx = 0; qidx < PAFTP_REORDER_QUEUE_SIZE; qidx++)
         {
-            if (ReorderQueue[qidx] != nullptr)
+            if (!ReorderQueue[qidx].IsNull())
             {
                 ReorderQueue[qidx] = nullptr;
-                ItemsInReorderQueue--;
             }
         }
+        ItemsInReorderQueue = 0;
 
         // If transmit buffer is empty or a transmission abort was specified...
         if (mPafTP.TxState() == WiFiPAFTP::kState_Idle || (flags & kWiFiPAFCloseFlag_AbortTransmission))
@@ -696,9 +696,16 @@ CHIP_ERROR WiFiPAFEndPoint::HandleCapabilitiesRequestReceived(PacketBufferHandle
     resp.mFragmentSize = std::min(static_cast<uint16_t>(mtu), WiFiPAFTP::sMaxFragmentSize);
 
     // Select local and remote max receive window size based on local resources available for both incoming writes
-    mRemoteReceiveWindowSize = mLocalReceiveWindowSize = mReceiveWindowMaxSize =
-        std::min(req.mWindowSize, static_cast<uint8_t>(PAF_MAX_RECEIVE_WINDOW_SIZE));
-    resp.mWindowSize = mReceiveWindowMaxSize;
+    auto windowSize = std::min(req.mWindowSize, static_cast<uint8_t>(PAF_MAX_RECEIVE_WINDOW_SIZE));
+    if (windowSize < PAF_MIN_RECEIVE_WINDOW_SIZE)
+    {
+        // The Window size should be at least PAF_MIN_RECEIVE_WINDOW_SIZE to ensure PAF stability and avoid underflow problems.
+        ChipLogError(WiFiPAF, "Small window size: %u, reject due to stability requirement", windowSize);
+        mState = kState_Aborting;
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    mRemoteReceiveWindowSize = mLocalReceiveWindowSize = mReceiveWindowMaxSize = windowSize;
+    resp.mWindowSize                                                           = mReceiveWindowMaxSize;
     ChipLogProgress(WiFiPAF, "local and remote recv window sizes = %u", resp.mWindowSize);
 
     // Select PAF transport protocol version from those supported by central, or none if no supported version found.
@@ -766,8 +773,14 @@ CHIP_ERROR WiFiPAFEndPoint::HandleCapabilitiesResponseReceived(PacketBufferHandl
     ChipLogProgress(WiFiPAF, "using PAFTP fragment sizes rx %d / tx %d.", mPafTP.GetRxFragmentSize(), mPafTP.GetTxFragmentSize());
 
     // Select local and remote max receive window size based on local resources available for both incoming indications
+    if (resp.mWindowSize < PAF_MIN_RECEIVE_WINDOW_SIZE)
+    {
+        // The Window size should be at least PAF_MIN_RECEIVE_WINDOW_SIZE to ensure PAF stability and avoid underflow problems.
+        ChipLogError(WiFiPAF, "Small window size: %u, reject due to stability requirement", resp.mWindowSize);
+        mState = kState_Aborting;
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
     mRemoteReceiveWindowSize = mLocalReceiveWindowSize = mReceiveWindowMaxSize = resp.mWindowSize;
-
     ChipLogProgress(WiFiPAF, "local and remote recv window size = %u", resp.mWindowSize);
 
     // Shrink local receive window counter by 1, since connect handshake indication requires acknowledgement.
@@ -922,14 +935,14 @@ CHIP_ERROR WiFiPAFEndPoint::Receive(PacketBufferHandle && data)
     }
 
     // Save the packet to the reorder-queue
-    if (ReorderQueue[offset] == nullptr)
+    if (ReorderQueue[offset].IsNull())
     {
-        ReorderQueue[offset] = std::move(data).UnsafeRelease();
+        ReorderQueue[offset] = std::move(data);
         ItemsInReorderQueue++;
     }
 
     // Consume the packets in the reorder queue if no hole exists
-    if (ReorderQueue[0] == nullptr)
+    if (ReorderQueue[0].IsNull())
     {
         // The hole still exists => Can't continue
         ChipLogError(WiFiPAF, "The hole still exists. Packets in reorder-queue: %u", ItemsInReorderQueue);
@@ -939,24 +952,23 @@ CHIP_ERROR WiFiPAFEndPoint::Receive(PacketBufferHandle && data)
     for (qidx = 0; qidx < PAFTP_REORDER_QUEUE_SIZE; qidx++)
     {
         // The head slots should have been filled. => Do rx processing
-        if (ReorderQueue[qidx] == nullptr)
+        if (ReorderQueue[qidx].IsNull())
         {
             // Stop consuming packets until the hole or no packets
             break;
         }
         // Consume the saved packets
         ChipLogProgress(WiFiPAF, "Rx processing from the re-order queue [%u]", qidx);
-        err                = RxPacketProcess(System::PacketBufferHandle::Adopt(ReorderQueue[qidx]));
-        ReorderQueue[qidx] = nullptr;
+        err = RxPacketProcess(std::move(ReorderQueue[qidx]));
         ItemsInReorderQueue--;
     }
     // Has reached the 1st hole in the queue => move the rest items forward
     // Note: It's to continue => No need to reinit "i"
     for (uint8_t newId = 0; qidx < PAFTP_REORDER_QUEUE_SIZE; qidx++, newId++)
     {
-        if (ReorderQueue[qidx] != nullptr)
+        if (!ReorderQueue[qidx].IsNull())
         {
-            ReorderQueue[newId] = ReorderQueue[qidx];
+            ReorderQueue[newId] = std::move(ReorderQueue[qidx]);
             ReorderQueue[qidx]  = nullptr;
         }
     }
diff --git a/src/wifipaf/WiFiPAFEndPoint.h b/src/wifipaf/WiFiPAFEndPoint.h
index 885c20c668a..4335ebdd7e7 100644
--- a/src/wifipaf/WiFiPAFEndPoint.h
+++ b/src/wifipaf/WiFiPAFEndPoint.h
@@ -103,7 +103,7 @@ class DLL_EXPORT WiFiPAFEndPoint
     WiFiPAFSession mSessionInfo;
     SequenceNumber_t mRxAck;
 #define PAFTP_REORDER_QUEUE_SIZE PAF_MAX_RECEIVE_WINDOW_SIZE
-    System::PacketBuffer * ReorderQueue[PAFTP_REORDER_QUEUE_SIZE];
+    PacketBufferHandle ReorderQueue[PAFTP_REORDER_QUEUE_SIZE] = {};
     uint8_t ItemsInReorderQueue;
 
     enum class ConnectionStateFlag : uint8_t
diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
index 0cf4768465f..aedc117d42a 100644
--- a/third_party/bouffalolab/bl602/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
@@ -20,7 +20,6 @@ import("${chip_root}/src/lib/lib.gni")
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
-  enable_lwip_pbuf_ram = false
   enable_debug_coredump = false
   coredump_binary_id = 0
 }
@@ -42,7 +41,6 @@ template("bl_iot_sdk") {
       "BL602=BL602",
       "BL602_USE_HAL_DRIVER=1",
 
-      "CFG_CHIP_BL602",
       "CFG_COMPONENT_BLOG_ENABLE=0",
     ]
 
@@ -55,19 +53,16 @@ template("bl_iot_sdk") {
       defines += invoker.defines
     }
 
-    cflags = [ "-Wundef" ]
     cflags_c = [
+      "-Wno-sign-compare",
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
     cflags_cc = [
+      "-Wno-sign-compare",
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
-
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-    }
   }
 
   source_set("${sdk_target_name}_soc") {
@@ -140,15 +135,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl602/bl602_std/bl602_std/StdDriver/Src/bl602_xip_sflash_ext.c",
     ]
 
-    configs += [ ":${sdk_target_name}_config_freertos" ]
-    public_configs = [
+    cflags_c = [ "-Wno-unused-variable" ]
+
+    configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_BSP_Driver",
-    ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-variable",
+      ":${sdk_target_name}_config_freertos",
     ]
+    public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ]
   }
 
   config("${sdk_target_name}_config_freertos") {
@@ -179,15 +172,9 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl602/freertos_riscv_ram/timers.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-old-style-declaration",
-    ]
-
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
-    ]
+    cflags_c = [ "-Wno-old-style-declaration" ]
+    configs += [ ":${sdk_target_name}_config" ]
+    public_configs = [ ":${sdk_target_name}_config_freertos" ]
   }
 
   config("${sdk_target_name}_config_hosal") {
@@ -202,13 +189,7 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_hosal") {
-    defines = [ "CONF_BL602_USE_1M_FLASH=0" ]
-
-    if (defined(invoker.chip_config_network_layer_ble) &&
-        invoker.chip_config_network_layer_ble) {
-      defines += [ "CFG_BLE_ENABLE" ]
-    }
-
+    defines = [ "CFG_BLE_ENABLE" ]
     if (defined(invoker.enable_debug_coredump) &&
         invoker.enable_debug_coredump) {
       defines += [ "SYS_ENABLE_COREDUMP" ]
@@ -253,9 +234,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hal_pds.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hal_sys.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hal_wifi.c",
-
-      #     hosal_adc.c is included by the code in wifi module
-      #      "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_adc.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_adc.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_dac.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_dma.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_efuse.c",
@@ -279,29 +258,25 @@ template("bl_iot_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
       "-Wno-shadow",
-      "-Wno-unused-but-set-variable",
-      "-Wno-old-style-declaration",
-      "-Wno-stringop-overflow",
       "-Wno-format-truncation",
-      "-Wno-unused-variable",
       "-Wno-array-bounds",
+      "-Wno-stringop-overflow",
+      "-Wno-old-style-declaration",
     ]
+
     configs += [
-      ":${sdk_target_name}_config_wifi",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_stage",
       ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_ble",
+      ":${sdk_target_name}_config_wifi",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_hosal",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_hosal" ]
   }
 
   config("${sdk_target_name}_config_fs") {
@@ -320,21 +295,15 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_inode.c",
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_register.c",
     ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-builtin-declaration-mismatch",
-    ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_stage",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_fs",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_fs" ]
   }
 
   source_set("${sdk_target_name}_libc") {
@@ -350,7 +319,6 @@ template("bl_iot_sdk") {
 
   config("${sdk_target_name}_config_stage") {
     include_dirs = [
-      "${bl_iot_sdk_root}/components/stage/easyflash4/inc",
       "${bl_iot_sdk_root}/components/stage/yloop/include",
       "${bl_iot_sdk_root}/components/stage/blog",
       "${bl_iot_sdk_root}/components/stage/yloop/include/aos",
@@ -401,19 +369,9 @@ template("bl_iot_sdk") {
       defines += [ "BFLB_COREDUMP_BINARY_ID=${invoker.coredump_binary_id}" ]
       sources +=
           [ "${bl_iot_sdk_root}/components/stage/coredump/bl_coredump.c" ]
+      cflags_c = [ "-Wno-type-limits" ]
     }
 
-    cflags_c = [ "-Wno-sign-compare" ]
-    configs += [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_BSP_Driver",
-      ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_fs",
-      ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_hosal",
-    ]
-
     if (defined(invoker.bouffalo_sdk_component_easyflash_enabled) &&
         invoker.bouffalo_sdk_component_easyflash_enabled) {
       defines += [ "EF_ENV_CACHE_TABLE_SIZE=64" ]
@@ -436,6 +394,16 @@ template("bl_iot_sdk") {
       ]
     }
 
+    configs += [
+      ":${sdk_target_name}_config",
+      ":${sdk_target_name}_config_BSP_Driver",
+      ":${sdk_target_name}_config_hosal",
+      ":${sdk_target_name}_config_fs",
+      ":${sdk_target_name}_config_sys",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
+    ]
+
     public_configs = [ ":${sdk_target_name}_config_stage" ]
   }
 
@@ -455,15 +423,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/sys/bltime/bl_sys_time.c",
     ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_sys",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_sys" ]
   }
 
   config("${sdk_target_name}_config_utils") {
@@ -492,20 +458,14 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/utils/src/utils_tlv_bl.c",
     ]
 
-    cflags_c = [
-      "-Wno-shadow",
-      "-Wno-sign-compare",
-      "-Wno-incompatible-pointer-types",
-    ]
+    cflags_c = [ "-Wno-shadow" ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_utils",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_utils" ]
   }
 
   config("${sdk_target_name}_config_mbedtls") {
@@ -555,6 +515,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ctr_drbg.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ecdh.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ecdsa.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ecjpake.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ecp.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ecp_curves.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/entropy.c",
@@ -571,25 +532,25 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/platform_util.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/sha256.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/sha512.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_ciphersuites.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_cli.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_cookie.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_msg.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_srv.c",
+      "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/ssl_tls.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509_create.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509_crt.c",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509write_csr.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-implicit-function-declaration",
-    ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_mbedtls",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_mbedtls" ]
   }
 
   config("${sdk_target_name}_config_ble") {
@@ -607,43 +568,24 @@ template("bl_iot_sdk") {
     ]
 
     defines = [
+      "CONFIG_BT_CONN=1",
+      "CONFIG_BLE_TX_BUFF_DATA=2",
+      "CONFIG_BT_PERIPHERAL",
+      "CFG_BLE_ENABLE",
       "BFLB_BLE",
-      "CONFIG_SET_TX_PWR",
-      "CFG_CON=1",
       "CFG_BLE",
-      "CFG_SLEEP",
-      "CONFIG_BT_PERIPHERAL=1",
-      "CFG_BLE_TX_BUFF_DATA=2",
-      "CONFIG_BT_GATT_DYNAMIC_DB",
-      "CONFIG_BT_GATT_SERVICE_CHANGED",
-      "CONFIG_BT_SETTINGS_CCC_LAZY_LOADING",
-      "CONFIG_BT_KEYS_OVERWRITE_OLDEST",
-      "CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS",
-      "CONFIG_BT_BONDABLE",
-      "CONFIG_BT_ASSERT",
-      "CFG_BLE_STACK_DBG_PRINT",
+      "CFG_IOT_SDK",
+
+      "CONFIG_CON=1",
+      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
+      "CONFIG_BT_GATT_CLIENT",
     ]
 
     cflags_cc = [ "-Wno-conversion" ]
   }
 
   source_set("${sdk_target_name}_ble") {
-    defines = [
-      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
-      "CONFIG_BT_GATT_CLIENT",
-      "CONFIG_BT_CONN=1",
-      "CONFIG_BT_GATT_DIS_PNP",
-      "CONFIG_BT_GATT_DIS_SERIAL_NUMBER",
-      "CONFIG_BT_GATT_DIS_FW_REV",
-      "CONFIG_BT_GATT_DIS_HW_REV",
-      "CONFIG_BT_GATT_DIS_SW_REV",
-      "CONFIG_BT_ECC",
-      "CONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING",
-      "CONFIG_BT_HCI_VS_EVT_USER",
-      "CONFIG_BT_SETTINGS_USE_PRINTK",
-    ]
-
-    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_602_m0s1/lib/libblecontroller_602_m0s1.a" ]
+    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_bl602_m0s1/lib/libblecontroller_bl602_m0s1.a" ]
 
     include_dirs = [
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common",
@@ -673,30 +615,19 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/port/bl_port.c",
     ]
 
-    configs += [
-      ":${sdk_target_name}_config_BSP_Driver",
-      ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_hosal",
+    cflags_c = [
+      "-Wno-type-limits",
+      "-Wno-misleading-indentation",
     ]
-    public_configs = [
+
+    configs += [
       ":${sdk_target_name}_config",
+      ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_ble",
-    ]
-
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-but-set-variable",
-      "-Wno-misleading-indentation",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
-      "-Wno-unused-function",
-      "-Wno-incompatible-pointer-types",
-      "-Wno-discarded-qualifiers",
-      "-Wno-unused-variable",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
     ]
+    public_configs = [ ":${sdk_target_name}_config_ble" ]
   }
 
   config("${sdk_target_name}_config_blcrypto_suite") {
@@ -707,6 +638,8 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_blcrypto_suite") {
+    defines = [ "CFG_CHIP_BL602" ]
+
     include_dirs = [
       "${bl_iot_sdk_root}/components/security/blcrypto_suite/priv_inc",
       "${bl_iot_sdk_root}/components/security/blcrypto_suite/priv_inc",
@@ -725,15 +658,15 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/blcrypto_suite/src/blcrypto_suite_supplicant_api.c",
     ]
 
+    cflags_c = [ "-Wno-implicit-function-declaration" ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_blcrypto_suite",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_blcrypto_suite" ]
   }
 
   config("${sdk_target_name}_config_wifi") {
@@ -747,11 +680,15 @@ template("bl_iot_sdk") {
       "TDLS_ENABLE=0",
       "CONFIG_NEWLIB_NANO_FORMAT=0",
     ]
+
     include_dirs = [
       "${bl_iot_sdk_root}/components/os/bl_os_adapter/bl_os_adapter/include",
       "${bl_iot_sdk_root}/components/os/bl_os_adapter/bl_os_adapter/include/bl_os_adapter",
       "${bl_iot_sdk_root}/components/network/wifi/include",
-      "${bl_iot_sdk_root}/components/network/wifi_hosal/include",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/bflb_adapter",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/bflb_adapter/include",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/bflb_adapter/include/bflb_os_adapter",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/wifi_hosal/include",
       "${bl_iot_sdk_root}/components/network/wifi_manager",
       "${bl_iot_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver/include",
       "${bl_iot_sdk_root}/components/security",
@@ -759,16 +696,12 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/wpa_supplicant/src",
       "${bl_iot_sdk_root}/components/security/wpa_supplicant/port/include",
     ]
-
-    cflags_c = [ "-Wno-sign-compare" ]
-    cflags_cc = [ "-Wno-sign-compare" ]
   }
 
   source_set("${sdk_target_name}_wifi") {
     defines = [
-      "BL602_MATTER_SUPPORT",
-      "LWIP_IPV6=1",
       "CONFIG_WPA_WAPI_PSK=0",
+      "CFG_CHIP_BL602",
     ]
 
     include_dirs = [
@@ -798,8 +731,9 @@ template("bl_iot_sdk") {
 
     sources += [
       "${bl_iot_sdk_root}/components/network/rfparam_adapter_tmp/rftlv/phy_rftlv.c",
-      "${bl_iot_sdk_root}/components/network/wifi_hosal/port/wifi_hosal_bl602.c",
-      "${bl_iot_sdk_root}/components/network/wifi_hosal/wifi_hosal.c",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/bflb_adapter/plat_iot_sdk.c",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/wifi_hosal/port/wifi_hosal_bl602.c",
+      "${bl_iot_sdk_root}/components/network/wifi4_adapter/wifi_hosal/wifi_hosal.c",
       "${bl_iot_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver/bl_cmds.c",
       "${bl_iot_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver/bl_irqs.c",
       "${bl_iot_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver/bl_main.c",
@@ -883,6 +817,9 @@ template("bl_iot_sdk") {
       "-Wno-unused-variable",
       "-fcommon",
       "-Wno-undef",
+
+      "-Wno-overflow",
+      "-Wno-implicit-function-declaration",
     ]
 
     configs += [
@@ -911,10 +848,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip_dhcpd",
     ]
 
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      include_dirs += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip" ]
-    }
-
     defines = [ "LWIP_IPV6=1" ]
   }
 
@@ -936,6 +869,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/core/inet_chksum.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/init.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ip.c",
+      "${bl_iot_sdk_root}/components/network/lwip/src/core/mem.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/memp.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/netif.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/pbuf.c",
@@ -949,12 +883,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/core/udp.c",
     ]
 
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      sources += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c" ]
-    } else {
-      sources += [ "${bl_iot_sdk_root}/components/network/lwip/src/core/mem.c" ]
-    }
-
     sources += [
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ipv4/autoip.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ipv4/dhcp.c",
@@ -990,21 +918,18 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/api/sockets.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/api/tcpip.c",
     ]
-    sources +=
-        [ "${bl_iot_sdk_root}/components/network/lwip/src/apps/mdns/mdns.c" ]
-    sources +=
-        [ "${bl_iot_sdk_root}/components/network/lwip_dhcpd/dhcp_server_raw.c" ]
 
     cflags_c = [
       "-Wno-unused-variable",
       "-Wno-incompatible-pointer-types",
       "-Wno-sign-compare",
     ]
-    configs += [ ":${sdk_target_name}_config_freertos" ]
-    public_configs = [
+
+    configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_lwip",
+      ":${sdk_target_name}_config_freertos",
     ]
+    public_configs = [ ":${sdk_target_name}_config_lwip" ]
   }
 
   config("${sdk_target_name}_config_factory_data") {
@@ -1021,9 +946,9 @@ template("bl_iot_sdk") {
 
     configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
+      ":${sdk_target_name}_config_freertos",
     ]
     public_configs = [ ":${sdk_target_name}_config_factory_data" ]
   }
diff --git a/third_party/bouffalolab/bl616/bouffalo_sdk.gni b/third_party/bouffalolab/bl616/bouffalo_sdk.gni
index 3f5d9d5c69e..ef5ac2b6c8a 100644
--- a/third_party/bouffalolab/bl616/bouffalo_sdk.gni
+++ b/third_party/bouffalolab/bl616/bouffalo_sdk.gni
@@ -19,9 +19,8 @@ import("${chip_root}/src/lib/lib.gni")
 
 declare_args() {
   # Location of the bl616 SDK.
-  bouffalo_sdk_root = "${chip_root}/third_party/bouffalolab/bouffalo_sdk"
+  bouffalo_sdk_root = "${chip_root}/third_party/bouffalolab/repo_bouffalo_sdk"
 
-  enable_lwip_pbuf_ram = false
   enable_debug_coredump = false
   coredump_binary_id = 0
   bouffalo_sdk_coredump_version = 1
@@ -63,6 +62,7 @@ template("bouffalo_sdk") {
       "-fstrict-volatile-bitfields",
       "-fshort-enums",
       "-Wno-unused-but-set-variable",
+      "-Wno-sign-compare",
     ]
 
     cflags = [
@@ -73,10 +73,6 @@ template("bouffalo_sdk") {
     if (defined(invoker.defines)) {
       defines += invoker.defines
     }
-
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-    }
   }
 
   config("${sdk_target_name}_config_startup") {
@@ -106,11 +102,13 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/drivers/soc/bl616/std/startup/vector.S",
     ]
 
+    cflags_c = [ "-Wno-sign-compare" ]
+
     configs += [
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_std_drv",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
     ]
 
     public_configs = [
@@ -136,7 +134,6 @@ template("bouffalo_sdk") {
   source_set("${sdk_target_name}_std_drv") {
     defines = [
       "ARCH_RISCV",
-      "BFLB_USE_HAL_DRIVER",
       "BFLB_USE_ROM_DRIVER",
     ]
 
@@ -174,14 +171,12 @@ template("bouffalo_sdk") {
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_startup",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config_std_drv",
-      ":${sdk_target_name}_config",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_std_drv" ]
   }
 
   config("${sdk_target_name}_config_lhal") {
@@ -203,10 +198,7 @@ template("bouffalo_sdk") {
       "CONFIG_IRQ_NUM=80",
     ]
 
-    include_dirs = [
-      #bl616 lhal
-      "${bouffalo_sdk_root}/drivers/lhal/include",
-    ]
+    include_dirs = [ "${bouffalo_sdk_root}/drivers/lhal/include" ]
 
     sources = [
       "${bouffalo_sdk_root}/drivers/lhal/config/bl616/device_table.c",
@@ -249,28 +241,16 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/drivers/lhal/src/flash/bflb_xip_sflash.c",
     ]
 
-    libs = [ "${bouffalo_sdk_root}/drivers/lhal/src/pka/libpka.a" ]
+    libs = [ "${bouffalo_sdk_root}/drivers/lhal/src/pka/libpka_bl616.a" ]
 
-    cflags_c = [
-      "-Wno-shadow",
-      "-Wno-sign-compare",
-      "-Wno-implicit-fallthrough",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
-      "-Wno-unused-function",
-    ]
+    cflags_c = [ "-Wno-shadow" ]
 
     configs += [
-      ":${sdk_target_name}_config_startup",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_std_drv",
-      ":${sdk_target_name}_config_freertos",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_lhal",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_lhal" ]
   }
 
   config("${sdk_target_name}_config_sys") {
@@ -288,7 +268,6 @@ template("bouffalo_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
       "-Wno-shadow",
       "-Wno-format",
       "-Wno-format-nonliteral",
@@ -296,13 +275,11 @@ template("bouffalo_sdk") {
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_std_drv",
       ":${sdk_target_name}_config_lhal",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_sys",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_sys" ]
   }
 
   config("${sdk_target_name}_config_board") {
@@ -310,40 +287,66 @@ template("bouffalo_sdk") {
   }
 
   source_set("${sdk_target_name}_board") {
-    defines = [
-      "CONFIG_MBEDTLS",
-      "CONFIG_BFLOG",
-      "BL616",
-    ]
+    defines = [ "CONFIG_MBEDTLS" ]
 
     include_dirs = [ "${bouffalo_sdk_root}/bsp/board/bl616dk" ]
 
     sources = [
       "${bouffalo_sdk_root}/bsp/board/bl616dk/board.c",
+      "${bouffalo_sdk_root}/bsp/board/bl616dk/board_flash_psram.c",
+      "${bouffalo_sdk_root}/bsp/board/bl616dk/board_gpio.c",
       "${bouffalo_sdk_root}/bsp/board/bl616dk/board_rf.c",
       "${bouffalo_sdk_root}/bsp/board/bl616dk/fw_header.c",
     ]
 
     cflags_c = [
+      "-Wno-sign-compare",
+      "-Wno-type-limits",
       "-Wno-shadow",
-      "-Wno-enum-conversion",
       "-Wno-format",
       "-Wno-format-nonliteral",
       "-Wno-format-security",
     ]
 
     configs += [
-      ":${sdk_target_name}_config_startup",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_std_drv",
+      ":${sdk_target_name}_config_rf",
       ":${sdk_target_name}_config_lhal",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_mm",
-      ":${sdk_target_name}_config_rf",
     ]
 
     public_configs = [ ":${sdk_target_name}_config_board" ]
   }
 
+  config("${sdk_target_name}_config_eth_phy") {
+    include_dirs = [
+      "${bouffalo_sdk_root}/bsp/common/eth_phy",
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/lwip_netif_emac",
+    ]
+  }
+
+  source_set("${sdk_target_name}_eth_phy") {
+    sources = [
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/ephy_general.c",
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/ephy_lan8720.c",
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/eth_phy.c",
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/eth_phy_port.c",
+      "${bouffalo_sdk_root}/bsp/common/eth_phy/lwip_netif_emac/lwip_netif_emac.c",
+    ]
+
+    configs += [
+      ":${sdk_target_name}_config",
+      ":${sdk_target_name}_config_std_drv",
+      ":${sdk_target_name}_config_lhal",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_lwip",
+      ":${sdk_target_name}_config_freertos",
+    ]
+
+    public_configs = [ ":${sdk_target_name}_config_eth_phy" ]
+  }
+
   config("${sdk_target_name}_config_shell") {
     include_dirs = [ "${bouffalo_sdk_root}/components/shell" ]
   }
@@ -358,20 +361,15 @@ template("bouffalo_sdk") {
 
     cflags_c = [
       "-Wno-shadow",
-      "-Wno-enum-conversion",
       "-Wno-format-security",
-      "-Wno-format-truncation",
       "-Wno-format-nonliteral",
-      "-Wno-sign-compare",
     ]
 
     configs += [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_board",
       ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_mm",
     ]
     public_configs = [ ":${sdk_target_name}_config_shell" ]
   }
@@ -386,8 +384,6 @@ template("bouffalo_sdk") {
   }
 
   source_set("${sdk_target_name}_rf") {
-    defines = [ "RFPARAM_BL616" ]
-
     include_dirs = [ "${bouffalo_sdk_root}/drivers/rfparam/Inc" ]
 
     sources = [
@@ -397,20 +393,15 @@ template("bouffalo_sdk") {
 
     libs = [ "${bouffalo_sdk_root}/drivers/soc/bl616/phyrf/lib-gcc_10.2.0-toolchain_V2.6.1/libbl616_phyrf.a" ]
 
-    cflags_c = [
-      "-Wno-shadow",
-      "-Wno-sign-compare",
-    ]
+    cflags_c = [ "-Wno-shadow" ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_std_drv",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_utils",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_rf",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_rf" ]
   }
 
   source_set("${sdk_target_name}_libc") {
@@ -472,31 +463,27 @@ template("bouffalo_sdk") {
     ]
 
     cflags = [
-      "-fno-builtin",
-      "-Wno-sign-compare",
-      "-Wno-implicit-fallthrough",
+      "-Wno-nonnull-compare",
       "-Wno-builtin-declaration-mismatch",
+      "-Wno-implicit-fallthrough",
+      "-Wno-format",
+      "-Wno-format-truncation",
     ]
     configs += [
       ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_lhal",
+      ":${sdk_target_name}_config_utils",
     ]
     public_configs = [ ":${sdk_target_name}_config" ]
   }
 
   config("${sdk_target_name}_config_freertos") {
-    defines = [
-      "CONFIG_FREERTOS",
-      "configSTACK_ALLOCATION_FROM_SEPARATE_HEAP=1",
-    ]
+    defines = [ "CONFIG_FREERTOS" ]
 
     include_dirs = [
       "${bouffalo_sdk_root}/components/os/freertos/include",
       "${bouffalo_sdk_root}/components/os/freertos/portable/GCC/RISC-V/common",
       "${bouffalo_sdk_root}/components/os/freertos/portable/GCC/RISC-V/common/chip_specific_extensions/RV32I_CLINT_no_extensions",
-
-      #"${bouffalo_sdk_root}/components/os/freertos/posix/include",
-      "${chip_root}/examples/platform/bouffalolab/bl616",
     ]
   }
 
@@ -504,12 +491,9 @@ template("bouffalo_sdk") {
     defines = [
       "portasmHANDLE_INTERRUPT=interrupt_entry",
       "default_interrupt_handler=freertos_risc_v_trap_handler",
-
-      #"CONFIG_POSIX",
     ]
 
     include_dirs = [
-      #memory heap
       "${bouffalo_sdk_root}/components/os/freertos/include",
       "${bouffalo_sdk_root}/components/os/freertos/portable/GCC/RISC-V/common",
       "${bouffalo_sdk_root}/components/os/freertos/portable/GCC/RISC-V/common/chip_specific_extensions/RV32I_CLINT_no_extensions",
@@ -528,87 +512,38 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/components/os/freertos/timers.c",
     ]
 
-    public_configs = [
+    configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
+      ":${sdk_target_name}_config_mm",
     ]
+
+    public_configs = [ ":${sdk_target_name}_config_freertos" ]
   }
 
   config("${sdk_target_name}_config_mm") {
-    include_dirs = [
-      "${bouffalo_sdk_root}/components/mm",
-      "${bouffalo_sdk_root}/components/mm/tlsf",
-    ]
+    include_dirs = [ "${bouffalo_sdk_root}/components/mm" ]
   }
 
   source_set("${sdk_target_name}_mm") {
-    defines = [
-      "configSTACK_ALLOCATION_FROM_SEPARATE_HEAP=1",
-      "CONFIG_TLSF",
-    ]
+    defines = [ "CONFIG_TLSF" ]
 
-    include_dirs = [
-      #memory heap
-      "${bouffalo_sdk_root}/components/mm",
-      "${bouffalo_sdk_root}/components/mm/tlsf",
-    ]
+    include_dirs = [ "${bouffalo_sdk_root}/components/mm/tlsf" ]
 
     sources = [
-      "${bouffalo_sdk_root}/components/mm/mem.c",
-      "${bouffalo_sdk_root}/components/mm/tlsf/bflb_tlsf.c",
+      "${bouffalo_sdk_root}/components/mm/mm.c",
+      "${bouffalo_sdk_root}/components/mm/mm_debug.c",
       "${bouffalo_sdk_root}/components/mm/tlsf/tlsf.c",
-    ]
-
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
+      "${bouffalo_sdk_root}/components/mm/tlsf/tlsf_allocator.c",
     ]
 
     configs += [
-      ":${sdk_target_name}_config_lhal",
-      ":${sdk_target_name}_config_freertos",
-    ]
-
-    public_configs = [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_mm",
-    ]
-  }
-
-  config("${sdk_target_name}_config_easyflash4") {
-    include_dirs = [ "${bouffalo_sdk_root}/components/easyflash4/inc" ]
-  }
-
-  source_set("${sdk_target_name}_easyflash4") {
-    defines = [
-      "CONFIG_EASYFLASH4",
-      "BL616",
-      "EF_ENV_CACHE_TABLE_SIZE=100",
-    ]
-
-    include_dirs = [ "${bouffalo_sdk_root}/components/easyflash4/inc" ]
-
-    sources = [
-      "${bouffalo_sdk_root}/components/easyflash4/src/easyflash.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/easyflash_cli.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/ef_env.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/ef_env_legacy.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/ef_env_legacy_wl.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/ef_port.c",
-      "${bouffalo_sdk_root}/components/easyflash4/src/ef_utils.c",
-    ]
-
-    cflags_c = [ "-Wno-sign-compare" ]
-
-    configs += [
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_utils",
     ]
 
-    public_configs = [ ":${sdk_target_name}_config_easyflash4" ]
+    public_configs = [ ":${sdk_target_name}_config_mm" ]
   }
 
   config("${sdk_target_name}_config_littlefs") {
@@ -621,11 +556,6 @@ template("bouffalo_sdk") {
   }
 
   source_set("${sdk_target_name}_littlefs") {
-    defines = [
-      "CONFIG_LITTLEFS",
-      "CONFIG_FREERTOS",
-    ]
-
     include_dirs = [
       "${bouffalo_sdk_root}/components/fs/littlefs/littlefs",
       "${bouffalo_sdk_root}/components/fs/littlefs/port",
@@ -639,67 +569,57 @@ template("bouffalo_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
+      "-Wno-shadow",
       "-Wno-format",
       "-Wno-format-nonliteral",
       "-Wno-format-security",
-      "-Wno-shadow",
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_lhal",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_littlefs",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_littlefs" ]
   }
 
   config("${sdk_target_name}_config_utils") {
     include_dirs = [
-      "${bouffalo_sdk_root}/components/utils/log",
-      "${bouffalo_sdk_root}/components/utils/log/bflog",
+      "${bouffalo_sdk_root}/components/utils/async_event",
       "${bouffalo_sdk_root}/components/utils/bflb_mtd/include",
       "${bouffalo_sdk_root}/components/utils/bflb_ota",
       "${bouffalo_sdk_root}/components/utils/coredump",
       "${bouffalo_sdk_root}/components/utils/partition",
       "${bouffalo_sdk_root}/components/utils/getopt",
+      "${bouffalo_sdk_root}/components/utils/log",
+      "${bouffalo_sdk_root}/components/utils/log/bflb_log",
+      "${bouffalo_sdk_root}/components/utils/list",
       "${bouffalo_sdk_root}/components/utils/ring_buffer",
       "${bouffalo_sdk_root}/components/utils/math/include",
-      "${bouffalo_sdk_root}/components/utils/list",
     ]
 
-    defines = [
-      "CONFIG_LOG_LEVEL=0",
-      "CONFIG_BFLOG",
-      "CONFIG_BFLOG_DEBUG",
-    ]
+    defines = [ "CONFIG_LOG_LEVEL=0" ]
   }
 
   source_set("${sdk_target_name}_utils") {
-    defines = [
-      "CONFIG_LOG_LEVEL=0",
-      "CONFIG_BFLOG",
-      "CONFIG_BFLOG_DEBUG",
-    ]
-
+    defines = []
     if (defined(invoker.enable_debug_coredump) &&
         invoker.enable_debug_coredump) {
       defines += [ "CONFIG_COREDUMP" ]
     }
 
     sources = [
+      "${bouffalo_sdk_root}/components/utils/async_event/async_event.c",
+      "${bouffalo_sdk_root}/components/utils/async_event/rtos_al.c",
       "${bouffalo_sdk_root}/components/utils/bflb_mtd/bflb_boot2.c",
       "${bouffalo_sdk_root}/components/utils/bflb_mtd/bflb_mtd.c",
       "${bouffalo_sdk_root}/components/utils/bflb_ota/bflb_ota.c",
       "${bouffalo_sdk_root}/components/utils/bflb_ota/utils_sha256.c",
       "${bouffalo_sdk_root}/components/utils/getopt/utils_getopt.c",
-      "${bouffalo_sdk_root}/components/utils/log/bflog/bflog.c",
+      "${bouffalo_sdk_root}/components/utils/log/bflb_log/bflb_log.c",
       "${bouffalo_sdk_root}/components/utils/log/log.c",
-      "${bouffalo_sdk_root}/components/utils/log/log_freertos.c",
       "${bouffalo_sdk_root}/components/utils/math/src/utils_base64.c",
       "${bouffalo_sdk_root}/components/utils/math/src/utils_crc.c",
       "${bouffalo_sdk_root}/components/utils/math/src/utils_hex.c",
@@ -725,26 +645,21 @@ template("bouffalo_sdk") {
     }
 
     cflags_c = [
-      "-Wno-sign-compare",
       "-Wno-type-limits",
-      "-Wno-stringop-truncation",
       "-Wno-format",
       "-Wno-format-nonliteral",
       "-Wno-format-security",
-      "-Wno-implicit-function-declaration",
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_startup",
       ":${sdk_target_name}_config_std_drv",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_freertos",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_utils",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_utils" ]
   }
 
   config("${sdk_target_name}_config_mbedtls") {
@@ -758,8 +673,6 @@ template("bouffalo_sdk") {
   }
 
   source_set("${sdk_target_name}_mbedtls") {
-    defines = [ "CONFIG_FREERTOS" ]
-
     include_dirs =
         [ "${bouffalo_sdk_root}/components/crypto/mbedtls/mbedtls/library" ]
 
@@ -868,24 +781,19 @@ template("bouffalo_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-implicit-function-declaration",
       "-Wno-format",
       "-Wno-format-security",
       "-Wno-format-nonliteral",
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_lhal",
       ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_lwip",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_mbedtls",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_mbedtls" ]
   }
 
   config("${sdk_target_name}_config_lwip") {
@@ -900,16 +808,6 @@ template("bouffalo_sdk") {
 
     include_dirs +=
         [ "${bouffalo_sdk_root}/components/net/lwip/lwip/src/apps/dhcpd" ]
-
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      include_dirs += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip" ]
-    }
-
-    defines = [
-      "CONFIG_LWIP",
-      "CONFIG_MAC_TXQ_DEPTH=8",
-      "CONFIG_MAC_RXQ_DEPTH=8",
-    ]
   }
 
   source_set("${sdk_target_name}_lwip") {
@@ -947,6 +845,7 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/ipv6/ip6_frag.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/ipv6/mld6.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/ipv6/nd6.c",
+      "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/mem.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/memp.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/netif.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/pbuf.c",
@@ -961,67 +860,74 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/netif/ethernet.c",
     ]
 
-    if (defined(invoker.enable_lwip_pbuf_ram) && invoker.enable_lwip_pbuf_ram) {
-      sources += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c" ]
-    } else {
-      sources +=
-          [ "${bouffalo_sdk_root}/components/net/lwip/lwip/src/core/mem.c" ]
-    }
-
     sources += [
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/apps/dhcpd/dhcp_server_raw.c",
       "${bouffalo_sdk_root}/components/net/lwip/lwip/src/apps/lwiperf/lwiperf.c",
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
       "-Wno-format",
       "-Wno-format-nonliteral",
       "-Wno-format-security",
-      "-Wno-unused-variable",
     ]
 
     configs += [
-      ":${sdk_target_name}_config_std_drv",
-      ":${sdk_target_name}_config_lhal",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_wifi",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_lwip",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_lwip" ]
   }
 
   config("${sdk_target_name}_config_wifi") {
     defines = [
-      "CFG_VIF_MAX=2",
-      "CFG_STA_MAX=4",
-      "CFG_UMAC",
+      "__FILENAME__=__FILE__",
+      "CFG_IPV6",
+    ]
+    defines += [ "CONFIG_MACSW_SELECT_INCLUDE=\"macsw_default_config.h\"" ]
+    defines += [
+      "BOUFFALO_SDK",
+      "PLATFORM_PRIVDE_ERRNO",
+    ]
+    defines += [
+      "CONFIG_MACSW_LWIP",
+      "CONFIG_USE_MBEDTLS",
+      "CONFIG_NO_STDOUT_DEBUG",
     ]
 
     include_dirs = [
-      "${bouffalo_sdk_root}/components/wireless/wifi6/include",
-      "${bouffalo_sdk_root}/components/wireless/wifi6/bl6_os_adapter/include",
+      "${bouffalo_sdk_root}/components/wireless/macsw/inc",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/fhost/include",
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/include",
     ]
   }
 
   source_set("${sdk_target_name}_wifi") {
-    defines = [ "CFG_IPV6" ]
-    libs = [ "${bouffalo_sdk_root}/components/wireless/wifi6/lib/libwifi6.a" ]
-
-    include_dirs =
-        [ "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter" ]
+    libs = [
+      "${bouffalo_sdk_root}/components/wireless/macsw/lib/libmacsw_bl616_default.a",
+      "${bouffalo_sdk_root}/components/wireless/macsw/lib/libmacsw_config_bl616_default.a",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/fhost/lib/libfhost_bl616_default.a",
+    ]
 
     sources = [
-      "${bouffalo_sdk_root}/components/wireless/wifi6/bl6_os_adapter/src/platform_bouffalo_sdk.c",
-      "${bouffalo_sdk_root}/components/wireless/wifi6/bl6_os_adapter/src/rtos_al.c",
+      "${bouffalo_sdk_root}/components/wireless/macsw_plat.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/fhost_config/fhost_config_buffer.c",
+    ]
+
+    defines = [ "BOUFFALO_SDK" ]
+    include_dirs = [
+      "${bouffalo_sdk_root}/components/wireless/wifi6/macsw_os_adapter/include",
+    ]
+    sources += [
+      "${bouffalo_sdk_root}/components/wireless/wifi6/macsw_os_adapter/src/platform_bouffalo_sdk.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/macsw_os_adapter/src/rtos_al.c",
+    ]
+
+    include_dirs +=
+        [ "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter" ]
+    sources += [
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/cli_al.c",
-      "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/mat.c",
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/net_al.c",
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/net_al_ext.c",
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/pbuf_custom_ref.c",
@@ -1029,53 +935,201 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/components/wireless/wifi6/wifi6_lwip_adapter/wifi_pkt_hooks.c",
     ]
 
+    include_dirs += [
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/l2_packet",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/rsn_supp",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/drivers",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_peer",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eapol_supp",
+    ]
+    sources += [
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ap_config.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ap_drv_ops.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ap_list.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ap_mlme.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/authsrv.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/beacon.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/bss_load.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ctrl_iface_ap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/dfs.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/drv_callbacks.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/eap_user_db.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/hostapd.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/hw_features.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11_auth.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11_he.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11_ht.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11_shared.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_11_vht.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/ieee802_1x.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/mbo_ap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/neighbor_db.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/pmksa_cache_auth.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/rrm.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/sta_info.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/tkip_countermeasures.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/utils.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wmm.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wnm_ap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wpa_auth.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wpa_auth_glue.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wpa_auth_ie.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/ap/wps_hostapd.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/common/dragonfly.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/common/hw_features_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/common/ieee802_11_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/common/sae.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/common/wpa_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/drivers/driver_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/drivers/driver_macsw.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/drivers/drivers.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_common/eap_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_common/eap_wsc_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_peer/eap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_peer/eap_methods.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_peer/eap_wsc.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_server/eap_server.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_server/eap_server_identity.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eap_server/eap_server_methods.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eapol_auth/eapol_auth_sm.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/eapol_supp/eapol_supp_sm.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/l2_packet/l2_packet_macsw.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/rsn_supp/pmksa_cache.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/rsn_supp/preauth.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/rsn_supp/wpa.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/rsn_supp/wpa_ie.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/tls/bignum.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/base64.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/bitfield.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/crc32.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/eloop_rtos.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/ip_addr.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/os_macsw.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/uuid.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/wpa_debug.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/utils/wpabuf.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/aes-omac1.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/aes-unwrap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/aes-wrap.c",
+
+      #"${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_openssl.c",
+      #"${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_libtomcrypt.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_internal-modexp.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_mbedtls.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_mbedtls_misc.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/dh_group5.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/dh_groups.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/random.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/rc4.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/sha1-pbkdf2.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/sha1-prf.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/sha256-kdf.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/sha256-prf.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/tls_none.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_attr_build.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_attr_parse.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_attr_process.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_common.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_dev_attr.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_enrollee.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wps/wps_registrar.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/ap.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/bss.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/bssid_ignore.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/config.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/config_none.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/ctrl_iface.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/ctrl_iface_macsw.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/eap_register.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/events.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/main_macsw.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/mbo.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/notify.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/op_classes.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/robust_av.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/rrm.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/scan.c",
+
+      #"${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_openssl.c",
+      #"${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/src/wpa_crypto/crypto_libtomcrypt.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/sme.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/wmm_ac.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/wnm_sta.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/wpa_supplicant.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/wpas_glue.c",
+      "${bouffalo_sdk_root}/components/wireless/wifi6/wpa_supplicant/wpa_supplicant/wps_supplicant.c",
+    ]
+
     cflags_c = [
       "-Wno-error",
-      "-Wno-sign-compare",
-      "-Wno-int-conversion",
-      "-Wno-shadow",
-      "-Wno-incompatible-pointer-types",
-      "-Wno-implicit-function-declaration",
+      "-Wno-misleading-indentation",
       "-Wno-format",
       "-Wno-format-nonliteral",
-      "-Wno-discarded-qualifiers",
       "-Wno-format-security",
+      "-Wno-incompatible-pointer-types",
+      "-Wno-implicit-function-declaration",
+      "-Wno-shadow",
+      "-Wno-int-conversion",
+      "-Wno-discarded-qualifiers",
+      "-Wno-implicit-fallthrough",
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_std_drv",
+      ":${sdk_target_name}_config_rf",
       ":${sdk_target_name}_config_lhal",
+      ":${sdk_target_name}_config_sys",
+      ":${sdk_target_name}_config_lwip",
+      ":${sdk_target_name}_config_mbedtls",
       ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_shell",
+      ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_lwip",
-    ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_wifi",
+      ":${sdk_target_name}_config_shell",
     ]
+
+    public_configs = [ ":${sdk_target_name}_config_wifi" ]
   }
 
   config("${sdk_target_name}_config_ble") {
     defines = [
+      "CONFIG_FREERTOS",
+      "CONFIG_BLE_ENABLE",
       "BFLB_BLE",
-      "CONFIG_BT_CONN=1",
-
-      "CONFIG_SET_TX_PWR",
-      "CFG_CON=1",
-      "CFG_BLE",
-      "CFG_SLEEP",
-      "CFG_BT_RESET",
-      "CONFIG_BT_PERIPHERAL=1",
-      "CFG_BLE_TX_BUFF_DATA=2",
+      "CONFIG_BLE",
+      "CONFIG_BL_SDK",
+      "CONFIG_CON=1",
+      "CONFIG_BLE_TX_BUFF_DATA=2",
+      "CONFIG_BT_PERIPHERAL",
+      "CONFIG_BT_BROADCASTER",
+
+      "CONFIG_BLE_PDS",
+      "CONFIG_HW_SEC_ENG_DISABLE",
+      "CONFIG_EM_HEAP_DISABLE",
+      "CONFIG_BT_CONN",
+      "CONFIG_BT_HCI_VS_EVT_USER",
+      "CONFIG_BT_ASSERT",
+
+      "CONFIG_BT_GATT_DIS_PNP",
+      "CONFIG_BT_GATT_DIS_SERIAL_NUMBER",
+      "CONFIG_BT_GATT_DIS_FW_REV",
+      "CONFIG_BT_GATT_DIS_HW_REV",
+      "CONFIG_BT_GATT_DIS_SW_REV",
       "CONFIG_BT_GATT_DYNAMIC_DB",
       "CONFIG_BT_GATT_SERVICE_CHANGED",
-      "CONFIG_BT_SETTINGS_CCC_LAZY_LOADING",
       "CONFIG_BT_KEYS_OVERWRITE_OLDEST",
-      "CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS",
+      "CONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING",
       "CONFIG_BT_BONDABLE",
-      "CONFIG_BT_ASSERT",
-      "CFG_BLE_STACK_DBG_PRINT",
+
+      "CONFIG_BT_SETTINGS_USE_PRINTK",
     ]
 
     include_dirs = [
@@ -1093,22 +1147,6 @@ template("bouffalo_sdk") {
   }
 
   source_set("${sdk_target_name}_ble") {
-    defines = [
-      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
-      "CONFIG_BT_GATT_CLIENT",
-      "CONFIG_BT_CONN=1",
-      "CONFIG_BT_GATT_DIS_PNP",
-      "CONFIG_BT_GATT_DIS_SERIAL_NUMBER",
-      "CONFIG_BT_GATT_DIS_FW_REV",
-      "CONFIG_BT_GATT_DIS_HW_REV",
-      "CONFIG_BT_GATT_DIS_SW_REV",
-      "CONFIG_BT_ECC",
-      "CONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING",
-      "CONFIG_BT_HCI_VS_EVT_USER",
-      "CONFIG_BT_SETTINGS_USE_PRINTK",
-      "CONFIG_BLE_MULTI_ADV",
-    ]
-
     libs = [ "${bouffalo_sdk_root}/components/wireless/bluetooth/btblecontroller/lib/libbtblecontroller_bl616_ble1m0s1bredr0.a" ]
 
     include_dirs = [
@@ -1126,14 +1164,15 @@ template("bouffalo_sdk") {
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/common/dec.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/common/log.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/common/poll.c",
+      "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/common/rpa.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/common/work_q.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/hci_onchip/hci_driver.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/att.c",
-      "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/bl_host_assist.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/conn.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/crypto.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/gatt.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/hci_core.c",
+      "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/keys.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/l2cap.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/multi_adv.c",
       "${bouffalo_sdk_root}/components/wireless/bluetooth/blestack/src/host/settings.c",
@@ -1142,13 +1181,9 @@ template("bouffalo_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-implicit-function-declaration",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
-      "-Wno-discarded-qualifiers",
       "-Wno-misleading-indentation",
+      "-Wno-type-limits",
+      "-Wno-implicit-function-declaration",
     ]
 
     configs += [
@@ -1156,10 +1191,7 @@ template("bouffalo_sdk") {
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_ble",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_ble" ]
   }
 
   config("${sdk_target_name}_config_openthread_port") {
@@ -1176,6 +1208,7 @@ template("bouffalo_sdk") {
       "CONFIG_BL_SDK",
       "CHIP_HDR=<bl616.h>",
       "CHIP_GLB_HDR=<bl616_glb.h>",
+      "CHIP_SYS_HDR=<bl616_sys.h>",
       "MAC_ADDRESS_MAX_NUM=3",
     ]
 
@@ -1185,38 +1218,32 @@ template("bouffalo_sdk") {
     ]
 
     sources = [
-      "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_alarm_bl616.c",
+      "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_alarm.c",
+      "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_frame.c",
+      "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_linkmetric.c",
       "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_radio.c",
       "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_radio_bflb.c",
       "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_sys_bflb.c",
     ]
 
-    if (defined(invoker.bouffalo_sdk_component_easyflash_enabled) &&
-        invoker.bouffalo_sdk_component_easyflash_enabled) {
-      sources += [ "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_settings_easyflash.c" ]
-    } else {
-      sources += [ "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_settings_littlefs.c" ]
-    }
-
-    libs = [
-      "${bouffalo_sdk_root}/components/wireless/lmac154/lmac154/lib/liblmac154.a",
-      "${bouffalo_sdk_root}/components/wireless/thread/openthread_utils/lib/libopenthread_utils.a",
-    ]
+    sources += [ "${bouffalo_sdk_root}/components/wireless/thread/openthread_port/ot_settings_littlefs.c" ]
 
-    cflags_c = [ "-Wno-sign-compare" ]
+    libs = [ "${bouffalo_sdk_root}/components/wireless/lmac154/lmac154/lib/liblmac154_bl616.a" ]
 
-    configs += [ ":${sdk_target_name}_config_freertos" ]
-    public_configs = [
+    configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_std_drv",
       ":${sdk_target_name}_config_lhal",
-      ":${sdk_target_name}_config_shell",
+      ":${sdk_target_name}_config_sys",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_mm",
       ":${sdk_target_name}_config_littlefs",
-      ":${sdk_target_name}_config_openthread_port",
+      ":${sdk_target_name}_config_freertos",
+      ":${sdk_target_name}_config_shell",
     ]
 
+    public_configs = [ ":${sdk_target_name}_config_openthread_port" ]
+
     public_deps = [
       "${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
       "${openthread_root}/src/core:libopenthread_core_headers",
@@ -1259,13 +1286,7 @@ template("bouffalo_sdk") {
       ":${sdk_target_name}_sys",
       ":${sdk_target_name}_utils",
     ]
-
-    if (defined(invoker.bouffalo_sdk_component_easyflash_enabled) &&
-        invoker.bouffalo_sdk_component_easyflash_enabled) {
-      public_deps += [ ":${sdk_target_name}_easyflash4" ]
-    } else {
-      public_deps += [ ":${sdk_target_name}_littlefs" ]
-    }
+    public_deps += [ ":${sdk_target_name}_littlefs" ]
 
     if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
       public_deps += [ ":${sdk_target_name}_wifi" ]
@@ -1273,6 +1294,10 @@ template("bouffalo_sdk") {
     } else if (defined(invoker.chip_enable_thread) &&
                invoker.chip_enable_thread) {
       public_deps += [ ":${sdk_target_name}_openthread_port" ]
+    } else if (defined(invoker.chip_enable_ethernet) &&
+               invoker.chip_enable_ethernet) {
+      public_deps += [ ":${sdk_target_name}_eth_phy" ]
+      public_deps += [ ":${sdk_target_name}_lwip" ]
     }
 
     if (defined(invoker.chip_config_network_layer_ble) &&
diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
index 4dca141aa68..9d303898287 100644
--- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
@@ -21,7 +21,6 @@ import("${chip_root}/src/lib/lib.gni")
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
-  enable_lwip_pbuf_ram = false
   enable_debug_coredump = false
   coredump_binary_id = 0
 }
@@ -57,6 +56,7 @@ template("bl_iot_sdk") {
 
     cflags = [ "-Wundef" ]
     cflags_c = [
+      "-Wno-sign-compare",
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
@@ -80,15 +80,12 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702/evb/src/strntoumax.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702/evb/src/vprint.c",
     ]
-
     libs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_rf/lib/libbl702_rf.a" ]
 
     cflags_c = [ "-Wno-format-truncation" ]
-
-    configs += [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
-    ]
+    configs += [ ":${sdk_target_name}_config" ]
+    configs += [ ":${sdk_target_name}_config_freertos" ]
+    public_configs = [ ":${sdk_target_name}_config_soc" ]
   }
 
   config("${sdk_target_name}_config_BSP_Driver") {
@@ -102,8 +99,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_std/MCU_Common/misc",
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_std/BSP_Common/platform/",
     ]
-
-    defines = [ "bl706_iot" ]
   }
 
   source_set("${sdk_target_name}_BSP_Driver") {
@@ -147,15 +142,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_std/BSP_Driver/std_drv/src/bl702_xip_sflash_ext.c",
     ]
 
+    cflags_c = [ "-Wno-unused-variable" ]
+
     configs += [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_freertos",
     ]
     public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-variable",
-    ]
   }
 
   config("${sdk_target_name}_config_freertos") {
@@ -187,15 +180,9 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_freertos/timers.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-old-style-declaration",
-    ]
-
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
-    ]
+    cflags_c = [ "-Wno-old-style-declaration" ]
+    configs += [ ":${sdk_target_name}_config" ]
+    public_configs = [ ":${sdk_target_name}_config_freertos" ]
   }
 
   source_set("${sdk_target_name}_bl702_usb_cdc") {
@@ -217,7 +204,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_usb_cdc/Src/usbd_ioreq.c",
     ]
 
-    cflags_c = [ "-Wno-sign-compare" ]
     configs += [
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_BSP_Driver",
@@ -239,10 +225,7 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_hosal") {
-    defines = [
-      "CFG_USE_XTAL32K=1",
-      "DISABLE_PRINT=1",
-    ]
+    defines = [ "CFG_USE_XTAL32K=1" ]
 
     if (defined(invoker.chip_config_network_layer_ble) &&
         invoker.chip_config_network_layer_ble) {
@@ -305,23 +288,18 @@ template("bl_iot_sdk") {
     ]
 
     cflags_c = [
-      "-Wno-unused-variable",
-      "-Wno-sign-compare",
-      "-Wno-enum-conversion",
-      "-Wno-old-style-declaration",
-      "-Wno-stringop-overflow",
-      "-Wno-format-truncation",
       "-Wno-shadow",
-      "-Wno-incompatible-pointer-types",
+      "-Wno-format-truncation",
       "-Wno-array-bounds",
+      "-Wno-stringop-overflow",
     ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_soc",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_stage",
       ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
@@ -331,10 +309,7 @@ template("bl_iot_sdk") {
       configs += [ ":${sdk_target_name}_config_ble" ]
     }
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_hosal",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_hosal" ]
   }
 
   config("${sdk_target_name}_config_fs") {
@@ -353,21 +328,15 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_inode.c",
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_register.c",
     ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-builtin-declaration-mismatch",
-    ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_stage",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_fs",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_fs" ]
   }
 
   source_set("${sdk_target_name}_libc") {
@@ -439,19 +408,9 @@ template("bl_iot_sdk") {
       defines += [ "BFLB_COREDUMP_BINARY_ID=${invoker.coredump_binary_id}" ]
       sources +=
           [ "${bl_iot_sdk_root}/components/stage/coredump/bl_coredump.c" ]
+      cflags_c = [ "-Wno-type-limits" ]
     }
 
-    cflags_c = [ "-Wno-sign-compare" ]
-    configs += [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_BSP_Driver",
-      ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_fs",
-      ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_hosal",
-    ]
-
     if (defined(invoker.bouffalo_sdk_component_easyflash_enabled) &&
         invoker.bouffalo_sdk_component_easyflash_enabled) {
       defines += [ "EF_ENV_CACHE_TABLE_SIZE=64" ]
@@ -474,6 +433,16 @@ template("bl_iot_sdk") {
       ]
     }
 
+    configs += [
+      ":${sdk_target_name}_config",
+      ":${sdk_target_name}_config_BSP_Driver",
+      ":${sdk_target_name}_config_hosal",
+      ":${sdk_target_name}_config_fs",
+      ":${sdk_target_name}_config_sys",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
+    ]
+
     public_configs = [ ":${sdk_target_name}_config_stage" ]
   }
 
@@ -493,15 +462,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/sys/bltime/bl_sys_time.c",
     ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_sys",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_sys" ]
   }
 
   config("${sdk_target_name}_config_utils") {
@@ -530,20 +497,14 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/utils/src/utils_tlv_bl.c",
     ]
 
-    cflags_c = [
-      "-Wno-shadow",
-      "-Wno-sign-compare",
-      "-Wno-incompatible-pointer-types",
-    ]
+    cflags_c = [ "-Wno-shadow" ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_utils",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_utils" ]
   }
 
   config("${sdk_target_name}_config_mbedtls") {
@@ -622,19 +583,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509write_csr.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-implicit-function-declaration",
-    ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_mbedtls",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_mbedtls" ]
   }
 
   config("${sdk_target_name}_config_ble") {
@@ -652,43 +607,24 @@ template("bl_iot_sdk") {
     ]
 
     defines = [
+      "CONFIG_BT_CONN=1",
+      "CONFIG_BLE_TX_BUFF_DATA=2",
+      "CONFIG_BT_PERIPHERAL",
+      "CFG_BLE_ENABLE",
       "BFLB_BLE",
-      "CONFIG_SET_TX_PWR",
-      "CFG_CON=1",
       "CFG_BLE",
-      "CFG_SLEEP",
-      "CONFIG_BT_PERIPHERAL=1",
-      "CFG_BLE_TX_BUFF_DATA=2",
-      "CONFIG_BT_GATT_DYNAMIC_DB",
-      "CONFIG_BT_GATT_SERVICE_CHANGED",
-      "CONFIG_BT_SETTINGS_CCC_LAZY_LOADING",
-      "CONFIG_BT_KEYS_OVERWRITE_OLDEST",
-      "CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS",
-      "CONFIG_BT_BONDABLE",
-      "CONFIG_BT_ASSERT",
-      "CFG_BLE_STACK_DBG_PRINT",
+      "CFG_IOT_SDK",
+
+      "CONFIG_CON=1",
+      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
+      "CONFIG_BT_GATT_CLIENT",
     ]
 
     cflags_cc = [ "-Wno-conversion" ]
   }
 
   source_set("${sdk_target_name}_ble") {
-    defines = [
-      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
-      "CONFIG_BT_GATT_CLIENT",
-      "CONFIG_BT_CONN=1",
-      "CONFIG_BT_GATT_DIS_PNP",
-      "CONFIG_BT_GATT_DIS_SERIAL_NUMBER",
-      "CONFIG_BT_GATT_DIS_FW_REV",
-      "CONFIG_BT_GATT_DIS_HW_REV",
-      "CONFIG_BT_GATT_DIS_SW_REV",
-      "CONFIG_BT_ECC",
-      "CONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING",
-      "CONFIG_BT_HCI_VS_EVT_USER",
-      "CONFIG_BT_SETTINGS_USE_PRINTK",
-    ]
-
-    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_702_m1s1/lib/libblecontroller_702_m1s1.a" ]
+    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_bl702_m0s1/lib/libblecontroller_bl702_m0s1.a" ]
 
     include_dirs = [
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common",
@@ -718,34 +654,26 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/port/bl_port.c",
     ]
 
+    cflags_c = [
+      "-Wno-type-limits",
+      "-Wno-misleading-indentation",
+    ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_ble",
-    ]
-
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-but-set-variable",
-      "-Wno-misleading-indentation",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
-      "-Wno-unused-function",
-      "-Wno-incompatible-pointer-types",
-      "-Wno-discarded-qualifiers",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_ble" ]
   }
 
   config("${sdk_target_name}_config_openthread_port") {
     defines = [
       "OT_FREERTOS_ENABLE=1",
       "CONFIG_LMAC154_LOG=0",
+      "NXSPI_OPENTHREAD_RADIO=0",
     ]
 
     include_dirs = [
@@ -792,19 +720,15 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/thread/openthread_utils_bl702/lib/libopenthread_utils_bl702.a",
     ]
 
-    cflags_c = [ "-Wno-sign-compare" ]
-
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_stage",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_openthread_port",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_openthread_port" ]
 
     public_deps = [
       "${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
@@ -821,20 +745,24 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_ethernet") {
-    defines = [ "DISABLE_PRINT=1" ]
-    sources = [ "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/eth_bd.c" ]
+    sources = [
+      "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/ephy_general.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/ephy_lan8720.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/eth_bd.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/eth_phy.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Src/eth_phy_port.c",
+    ]
 
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_lwip",
+      ":${sdk_target_name}_config_freertos",
+      ":${sdk_target_name}_config_utils",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_ethernet",
-    ]
+
+    public_configs = [ ":${sdk_target_name}_config_ethernet" ]
   }
 
   config("${sdk_target_name}_config_wifi") {
@@ -864,27 +792,19 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/stage/virt_net/src/virt_net_ramsync.c",
     ]
 
+    cflags_c = [ "-Wno-stringop-truncation" ]
+
     configs += [
-      ":${sdk_target_name}_config_soc",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_stage",
-      ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_lwip",
     ]
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_wifi",
-    ]
-
-    cflags = [
-      "-Wno-sign-compare",
-      "-Wno-stringop-truncation",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_wifi" ]
   }
 
   config("${sdk_target_name}_config_lwip") {
@@ -968,20 +888,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/api/sockets.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/api/tcpip.c",
     ]
-    sources +=
-        [ "${bl_iot_sdk_root}/components/network/lwip/src/apps/mdns/mdns.c" ]
 
-    configs += [ ":${sdk_target_name}_config_freertos" ]
-    public_configs = [
+    configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_lwip",
+      ":${sdk_target_name}_config_freertos",
     ]
 
-    cflags = [
-      "-Wno-incompatible-pointer-types",
-      "-Wno-unused-variable",
-      "-Wno-sign-compare",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_lwip" ]
   }
 
   config("${sdk_target_name}_config_factory_data") {
@@ -998,9 +911,9 @@ template("bl_iot_sdk") {
 
     configs += [
       ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
+      ":${sdk_target_name}_config_freertos",
     ]
     public_configs = [ ":${sdk_target_name}_config_factory_data" ]
   }
@@ -1030,7 +943,8 @@ template("bl_iot_sdk") {
     } else if (defined(invoker.chip_enable_thread) &&
                invoker.chip_enable_thread) {
       public_deps += [ ":${sdk_target_name}_openthread_port" ]
-    } else {
+    } else if (defined(invoker.chip_enable_ethernet) &&
+               invoker.chip_enable_ethernet) {
       public_deps += [ ":${sdk_target_name}_ethernet" ]
       public_deps += [ ":${sdk_target_name}_lwip" ]
     }
diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
index b33b64dc20a..29149c4bb10 100644
--- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
@@ -21,7 +21,6 @@ import("${chip_root}/src/lib/lib.gni")
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
-  enable_lwip_pbuf_ram = false
   enable_pds = false
   enable_debug_coredump = false
   coredump_binary_id = 0
@@ -41,9 +40,9 @@ template("bl_iot_sdk") {
     defines = [
       "__FILENAME__=strrchr(__FILE__,'/')?strrchr(__FILE__,'/')+1:__FILE__",
       "ARCH_RISCV",
+      "BL702L=BL702L",
       "BUILD_ROM_CODE=1",
       "BFLB_USE_HAL_DRIVER=1",
-      "BL702L=BL702L",
       "CFG_COMPONENT_BLOG_ENABLE=0",
     ]
 
@@ -58,6 +57,7 @@ template("bl_iot_sdk") {
 
     cflags = [ "-Wundef" ]
     cflags_c = [
+      "-Wno-sign-compare",
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
@@ -74,11 +74,7 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_soc") {
-    defines = [
-      "CFG_CPP_ENABLE",
-      "SYS_APP_TASK_STACK_SIZE=1024",
-      "SYS_APP_TASK_PRIORITY=15",
-    ]
+    defines = [ "CFG_CPP_ENABLE" ]
 
     sources = [
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l/evb/src/boot/gcc/start.S",
@@ -89,20 +85,9 @@ template("bl_iot_sdk") {
 
     libs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_rf/lib/libbl702l_rf.a" ]
 
-    cflags_c = [
-      "-Wno-format-truncation",
-      "-Wno-unused-variable",
-    ]
-
-    configs += [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_BSP_Driver",
-      ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_fs",
-      ":${sdk_target_name}_config_stage",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_freertos",
-    ]
+    cflags_c = [ "-Wno-format-truncation" ]
+    configs += [ ":${sdk_target_name}_config" ]
+    configs += [ ":${sdk_target_name}_config_freertos" ]
     public_configs = [ ":${sdk_target_name}_config_soc" ]
   }
 
@@ -130,22 +115,19 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_i2c.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_pwm.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_pwm_sc.c",
-      "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_romapi_patch.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_sec_dbg.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_sec_eng.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_spi.c",
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/std_drv/src/bl702l_tzc_sec.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/MCU_Common/ring_buffer/ring_buffer.c",
+      "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/bl702l_romapi_patch.c",
     ]
-    sources += [ "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/MCU_Common/ring_buffer/ring_buffer.c" ]
+
     configs += [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_freertos",
     ]
     public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-variable",
-    ]
   }
 
   config("${sdk_target_name}_config_freertos") {
@@ -177,15 +159,9 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_freertos/timers.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-old-style-declaration",
-    ]
-
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_freertos",
-    ]
+    cflags_c = [ "-Wno-old-style-declaration" ]
+    configs += [ ":${sdk_target_name}_config" ]
+    public_configs = [ ":${sdk_target_name}_config_freertos" ]
   }
 
   config("${sdk_target_name}_config_hosal") {
@@ -207,6 +183,10 @@ template("bl_iot_sdk") {
       defines += [ "CFG_BLE_ENABLE" ]
     }
 
+    if (defined(invoker.enable_pds) && invoker.enable_pds) {
+      defines += [ "CFG_PDS_ENABLE" ]
+    }
+
     if (defined(invoker.enable_debug_coredump) &&
         invoker.enable_debug_coredump) {
       defines += [ "SYS_ENABLE_COREDUMP" ]
@@ -224,6 +204,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_ir.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_irq.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_kys.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_pds.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_psram.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_psram_sp.S",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_pwm.c",
@@ -238,6 +219,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_boot2.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_button.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_gpio.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_pds.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_sys.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_tcal.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hosal_adc.c",
@@ -253,35 +235,21 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hosal_timer.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hosal_uart.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hosal_wdg.c",
-    ]
-
-    sources += [
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_aes.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_pka.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_sha.c",
     ]
 
-    sources += [
-      "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_pds.c",
-      "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/hal_pds.c",
-    ]
-
     cflags_c = [
-      "-Wno-unused-variable",
-      "-Wno-sign-compare",
-      "-Wno-enum-conversion",
-      "-Wno-old-style-declaration",
-      "-Wno-stringop-overflow",
       "-Wno-format-truncation",
       "-Wno-shadow",
     ]
 
     configs += [
-      ":${sdk_target_name}_config_soc",
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_stage",
       ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
@@ -291,10 +259,7 @@ template("bl_iot_sdk") {
       configs += [ ":${sdk_target_name}_config_ble" ]
     }
 
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_hosal",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_hosal" ]
   }
 
   config("${sdk_target_name}_config_fs") {
@@ -313,21 +278,15 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_inode.c",
       "${bl_iot_sdk_root}/components/fs/vfs/src/vfs_register.c",
     ]
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-builtin-declaration-mismatch",
-    ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_stage",
-      ":${sdk_target_name}_config_fs",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_fs",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_fs" ]
   }
 
   source_set("${sdk_target_name}_libc") {
@@ -395,19 +354,9 @@ template("bl_iot_sdk") {
       defines += [ "BFLB_COREDUMP_BINARY_ID=${invoker.coredump_binary_id}" ]
       sources +=
           [ "${bl_iot_sdk_root}/components/stage/coredump/bl_coredump.c" ]
+      cflags_c = [ "-Wno-type-limits" ]
     }
 
-    cflags_c = [ "-Wno-sign-compare" ]
-    configs += [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_BSP_Driver",
-      ":${sdk_target_name}_config_fs",
-      ":${sdk_target_name}_config_sys",
-      ":${sdk_target_name}_config_utils",
-      ":${sdk_target_name}_config_freertos",
-      ":${sdk_target_name}_config_hosal",
-    ]
-
     if (defined(invoker.bouffalo_sdk_component_easyflash_enabled) &&
         invoker.bouffalo_sdk_component_easyflash_enabled) {
       sources += [
@@ -429,6 +378,16 @@ template("bl_iot_sdk") {
       ]
     }
 
+    configs += [
+      ":${sdk_target_name}_config",
+      ":${sdk_target_name}_config_BSP_Driver",
+      ":${sdk_target_name}_config_hosal",
+      ":${sdk_target_name}_config_fs",
+      ":${sdk_target_name}_config_sys",
+      ":${sdk_target_name}_config_utils",
+      ":${sdk_target_name}_config_freertos",
+    ]
+
     public_configs = [ ":${sdk_target_name}_config_stage" ]
   }
 
@@ -443,17 +402,18 @@ template("bl_iot_sdk") {
 
   source_set("${sdk_target_name}_sys") {
     include_dirs = [ "${bl_iot_sdk_root}/components/sys/bltime/include" ]
-    sources = [ "${bl_iot_sdk_root}/components/sys/blmtd/bl_mtd.c" ]
+    sources = [
+      "${bl_iot_sdk_root}/components/sys/blmtd/bl_mtd.c",
+      "${bl_iot_sdk_root}/components/sys/bltime/bl_sys_time.c",
+    ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_sys",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_sys" ]
   }
 
   config("${sdk_target_name}_config_utils") {
@@ -482,27 +442,20 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/utils/src/utils_tlv_bl.c",
     ]
 
-    cflags_c = [
-      "-Wno-shadow",
-      "-Wno-sign-compare",
-      "-Wno-incompatible-pointer-types",
-    ]
+    cflags_c = [ "-Wno-shadow" ]
+
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_hosal",
-      ":${sdk_target_name}_config_utils",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_utils",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_utils" ]
   }
 
   config("${sdk_target_name}_config_mbedtls") {
     include_dirs = [
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/include",
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/port",
-      "${chip_root}/src/platform/bouffalolab/BL702L",
     ]
 
     defines = [ "MBEDTLS_CONFIG_FILE=\"bl702l-chip-mbedtls-config.h\"" ]
@@ -575,19 +528,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/security/mbedtls_lts/mbedtls/library/x509write_csr.c",
     ]
 
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-implicit-function-declaration",
-    ]
     configs += [
+      ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
       ":${sdk_target_name}_config_hosal",
       ":${sdk_target_name}_config_freertos",
     ]
-    public_configs = [
-      ":${sdk_target_name}_config",
-      ":${sdk_target_name}_config_mbedtls",
-    ]
+    public_configs = [ ":${sdk_target_name}_config_mbedtls" ]
   }
 
   config("${sdk_target_name}_config_ble") {
@@ -606,19 +553,16 @@ template("bl_iot_sdk") {
     ]
 
     defines = [
-      "BUILD_ROM_CODE",
+      "CONFIG_BT_CONN=1",
+      "CONFIG_BLE_TX_BUFF_DATA=2",
+      "CONFIG_BT_PERIPHERAL",
       "CFG_BLE_ENABLE",
       "BFLB_BLE",
       "CFG_BLE",
       "CFG_IOT_SDK",
-      "CFG_CON=1",
-      "CFG_BLE_TX_BUFF_DATA=2",
-      "CONFIG_BT_PERIPHERAL",
-      "CONFIG_BT_BROADCASTER",
-      "CFG_EM_HEAP_DISABLE",
-      "CONFIG_BT_CONN",
-      "CONFIG_BT_HCI_VS_EVT_USER",
-      "CONFIG_BT_ASSERT",
+
+      "CONFIG_CON=1",
+      "CONFIG_BT_L2CAP_DYNAMIC_CHANNEL",
       "CONFIG_BT_GATT_CLIENT",
     ]
 
@@ -633,7 +577,7 @@ template("bl_iot_sdk") {
   }
 
   source_set("${sdk_target_name}_ble") {
-    libs = [ "${bl_iot_sdk_root}/components/network/ble/btblecontroller_702l_m0s1p/lib/libbtblecontroller_702l_m0s1p.a" ]
+    libs = [ "${bl_iot_sdk_root}/components/network/ble/btblecontroller_bl702l_m0s1p/lib/libbtblecontroller_bl702l_m0s1p.a" ]
     if (defined(invoker.enable_pds) && invoker.enable_pds) {
       libs += [ "${bl_iot_sdk_root}/components/network/ble/btble_pds/lib/libbtble_pds.a" ]
     }
@@ -666,6 +610,11 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/port/bl_port.c",
     ]
 
+    cflags_c = [
+      "-Wno-type-limits",
+      "-Wno-misleading-indentation",
+    ]
+
     configs += [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
@@ -674,35 +623,19 @@ template("bl_iot_sdk") {
       ":${sdk_target_name}_config_freertos",
     ]
     public_configs = [ ":${sdk_target_name}_config_ble" ]
-
-    cflags_c = [
-      "-Wno-sign-compare",
-      "-Wno-unused-but-set-variable",
-      "-Wno-misleading-indentation",
-      "-Wno-format",
-      "-Wno-format-nonliteral",
-      "-Wno-format-security",
-      "-Wno-unused-function",
-      "-Wno-incompatible-pointer-types",
-      "-Wno-discarded-qualifiers",
-      "-Wno-address-of-packed-member",
-
-      "-Wno-type-limits",
-      "-Wno-shadow",
-      "-Wno-unused-variable",
-    ]
   }
 
   config("${sdk_target_name}_config_openthread_port") {
     defines = [
       "OT_FREERTOS_ENABLE=1",
       "CONFIG_LMAC154_LOG=0",
+      "NXSPI_OPENTHREAD_RADIO=0",
     ]
 
     include_dirs = [
-      "${bl_iot_sdk_root}/components/network/lmac154/lmac154/include",
       "${openthread_root}/src/core",
       "${openthread_root}/examples/platforms",
+      "${bl_iot_sdk_root}/components/network/lmac154/lmac154/include",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/include",
       "${bl_iot_sdk_root}/components/network/thread/openthread_utils/include",
     ]
@@ -743,8 +676,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/thread/openthread_utils_bl702l/lib/libopenthread_utils_bl702l.a",
     ]
 
-    cflags_c = [ "-Wno-sign-compare" ]
-
     configs += [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_BSP_Driver",
diff --git a/third_party/bouffalolab/common/bouffalolab_executable.gni b/third_party/bouffalolab/common/bouffalolab_executable.gni
index 491cb49cdf5..0928f131613 100644
--- a/third_party/bouffalolab/common/bouffalolab_executable.gni
+++ b/third_party/bouffalolab/common/bouffalolab_executable.gni
@@ -53,8 +53,8 @@ template("bouffalolab_executable") {
     objcopy_image_name = output_base_name + ".raw"
     flashing_config_inputs = [
       "${chip_root}/examples/platform/bouffalolab/${invoker.bl_plat_name}/flash_config/partition_cfg_4M.toml",
-      "${chip_root}/third_party/bouffalolab/bouffalo_sdk/bsp/board/bl616dk/config/bl_factory_params_IoTKitA_auto.dts",
-      "${chip_root}/third_party/bouffalolab/bouffalo_sdk/bsp/board/bl616dk/config/boot2_bl616_isp_release_v8.1.6.bin",
+      "${chip_root}/third_party/bouffalolab/repo_bouffalo_sdk/bsp/board/bl616dk/config/bl_factory_params_IoTKitA_auto.dts",
+      "${chip_root}/third_party/bouffalolab/repo_bouffalo_sdk/bsp/board/bl616dk/config/boot2_bl616_isp_release_v8.1.8.bin",
     ]
 
     copy(flashing_config_target) {
diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo
index fe2856cff70..d46580788a8 160000
--- a/third_party/bouffalolab/repo
+++ b/third_party/bouffalolab/repo
@@ -1 +1 @@
-Subproject commit fe2856cff7012afef33563dc9980e110a752bf21
+Subproject commit d46580788a896536ff0c44ebfee5399033d75cb9
diff --git a/third_party/bouffalolab/repo_bouffalo_sdk b/third_party/bouffalolab/repo_bouffalo_sdk
new file mode 160000
index 00000000000..ad2a37b8eae
--- /dev/null
+++ b/third_party/bouffalolab/repo_bouffalo_sdk
@@ -0,0 +1 @@
+Subproject commit ad2a37b8eae3e618d5e9baafdfc4013266ebb59a
diff --git a/third_party/jsoncpp/repo b/third_party/jsoncpp/repo
index b511d9e6495..e799ca052df 160000
--- a/third_party/jsoncpp/repo
+++ b/third_party/jsoncpp/repo
@@ -1 +1 @@
-Subproject commit b511d9e64956db998b74909df112ac8c8f41d6ff
+Subproject commit e799ca052df0f859d8d4133211344581c211b925
diff --git a/third_party/libdatachannel/repo b/third_party/libdatachannel/repo
index 366ef5b87e9..28b2e730f4c 160000
--- a/third_party/libdatachannel/repo
+++ b/third_party/libdatachannel/repo
@@ -1 +1 @@
-Subproject commit 366ef5b87e983eb51555fb9c5767a09f690a0099
+Subproject commit 28b2e730f4c759a2610f0a7be2b20fea8c8899f5
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index c21be8ff8df..6c333865231 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit c21be8ff8df5ffe7433b1e50a9023311413afd09
+Subproject commit 6c33386523114b6c4872d4cd5d32079192801427
diff --git a/third_party/simw-top-mini/BUILD.gn b/third_party/simw-top-mini/BUILD.gn
index a74c3230f3f..c97daf7105b 100644
--- a/third_party/simw-top-mini/BUILD.gn
+++ b/third_party/simw-top-mini/BUILD.gn
@@ -35,7 +35,9 @@ config("se05x_config") {
   }
 
   if (chip_se05x_host_gpio == "rpi") {
-    defines += [ "SE05X_HOST_GPIO_RPI = 1" ]
+    defines += [ "CONFIG_SE05X_HOST_GPIO_RPI = 1" ]
+  } else if (chip_se05x_host_gpio == "frdm_imx93") {
+    defines += [ "CONFIG_SE05X_HOST_GPIO_FRDM_IMX93 = 1" ]
   }
 
   # defines += ["FLOW_VERBOSE"]
@@ -55,10 +57,27 @@ config("se05x_config") {
     "repo/hostlib/hostLib/libCommon/smCom/T1oI2C",
     "repo/hostlib/hostLib/accessManager/inc",
     "repo/demos/se05x_host_gpio",
+    "repo/demos/se051h_nfc_comm_prov/common",
   ]
 
+  if (chip_se05x_host_gpio == "frdm_imx93") {
+    include_dirs += [ "sysroot/usr/include" ]
+  }
+
   if (chip_se05x_auth == "scp03") {
-    include_dirs += [ "repo/scp03_ftr" ]
+    include_dirs += [ "repo/feature_file/scp03_ftr" ]
+  } else if (chip_se05x_auth == "user_id") {
+    include_dirs += [ "repo/feature_file/user_id_ftr" ]
+  } else if (chip_se05x_auth == "aes_key") {
+    include_dirs += [ "repo/feature_file/aes_key_ftr" ]
+  } else if (chip_se05x_auth == "ec_key") {
+    include_dirs += [ "repo/feature_file/ec_key_ftr" ]
+  } else if (chip_se05x_auth == "scp03_user_id") {
+    include_dirs += [ "repo/feature_file/scp03_user_id_ftr" ]
+  } else if (chip_se05x_auth == "scp03_aes_key") {
+    include_dirs += [ "repo/feature_file/scp03_aes_key_ftr" ]
+  } else if (chip_se05x_auth == "scp03_ec_key") {
+    include_dirs += [ "repo/feature_file/scp03_ec_key_ftr" ]
   } else {
     include_dirs += [ "repo" ]
   }
@@ -93,7 +112,10 @@ static_library("se05x") {
     "repo/sss/src/se05x/fsl_sss_se05x_policy.c",
   ]
 
-  if (chip_se05x_auth == "scp03") {
+  if (chip_se05x_auth == "scp03" || chip_se05x_auth == "user_id" ||
+      chip_se05x_auth == "aes_key" || chip_se05x_auth == "ec_key" ||
+      chip_se05x_auth == "scp03_user_id" ||
+      chip_se05x_auth == "scp03_aes_key" || chip_se05x_auth == "scp03_ec_key") {
     sources += [
       "repo/hostlib/hostLib/libCommon/nxScp/nxScp03_Com.c",
       "repo/sss/ex/src/ex_sss_scp03_auth.c",
@@ -129,5 +151,10 @@ static_library("se05x") {
     }
   }
 
+  if (chip_se05x_host_gpio == "frdm_imx93") {
+    lib_dirs = [ "sysroot/usr/lib" ]
+    libs = [ "gpiod" ]
+  }
+
   public_configs = [ ":se05x_config" ]
 }
diff --git a/third_party/simw-top-mini/repo b/third_party/simw-top-mini/repo
index b72b370d569..6a8f07263c8 160000
--- a/third_party/simw-top-mini/repo
+++ b/third_party/simw-top-mini/repo
@@ -1 +1 @@
-Subproject commit b72b370d569d1f8941278b4906ea6c94cbcc3b70
+Subproject commit 6a8f07263c8ab82e272be870100bdaa03a3da446
diff --git a/third_party/simw-top-mini/simw_config.gni b/third_party/simw-top-mini/simw_config.gni
index 1b60cab2237..112f751e699 100644
--- a/third_party/simw-top-mini/simw_config.gni
+++ b/third_party/simw-top-mini/simw_config.gni
@@ -20,14 +20,26 @@ import("//build_overrides/build.gni")
 
 # chip_se05x_auth:
 # To configure the session type to SE05x.
-# Possible values: none (For plain session), scp03 (Platform SCP03 authenticated session).
+# Possible values:
+#       none (For plain session),
+#       scp03 (Platform SCP03 authenticated session),
+#       user_id (User id Authentication),
+#       aes_key (AES Authentication with IoT applet),
+#       ec_key (EC key Authentication),
+#       scp03_user_id (SCP03 + User ID Authentication),
+#       scp03_aes_key (SCP03 + AES Key Authentication),
+#       scp03_ec_key (SCP03 + EC Key Authentication),
 
 # chip_se05x_host_gpio:
 # Enable / Disable the implementation of GPIO functions to control the SE05x secure element power.
 # Possible values:
-#  - none : GPIO function will have no impact.
-#  - rpi  : Enable GPIO function for Raspberry pi platform.
-#           Connect power pin of SE05x to Pin#11 of raspberry pi.
+#  - none        : GPIO function will have no impact.
+#  - rpi         : Enable GPIO function for Raspberry pi platform.
+#                  Connect Enable pin of SE05x to Pin#11 of raspberry pi.
+#                  Connect Jumper J14 to 3-4 on OM-SE051ARD.
+#  - frdm_imx93  : Enable GPIO function for frdm i.MX93.
+#                  Connect Enable pin of SE05x to Pin#29 of P11 connector on frdm i.MX93.
+#                  Connect Jumper J14 to 3-4 on OM-SE051ARD.
 
 declare_args() {
   chip_se05x_smcom = "t=1oi2c"
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 78c7ae6ea99..99f3a4f3ecb 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
@@ -8714,6 +8714,53 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value)
 
 } // namespace ExpiryDate
 
+namespace Unmounted {
+
+Protocols::InteractionModel::Status Get(EndpointId endpoint, bool * value)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    Traits::StorageType temp;
+    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
+    Protocols::InteractionModel::Status status =
+        emberAfReadAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+
+Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::SmokeCoAlarm::Id, Id),
+                                 EmberAfWriteDataInput(writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
+}
+
+Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value)
+{
+    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);
+}
+
+} // namespace Unmounted
+
 namespace FeatureMap {
 
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
@@ -25087,96 +25134,6 @@ Get(EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::IlluminanceMea
 namespace TemperatureMeasurement {
 namespace Attributes {
 
-namespace MeasuredValue {
-
-Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable<int16_t> & value)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
-    {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
-    }
-    return status;
-}
-
-Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status Set(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(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace MeasuredValue
-
 namespace MinMeasuredValue {
 
 Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable<int16_t> & value)
@@ -25198,73 +25155,6 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable
     return status;
 }
 
-Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status Set(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(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
@@ -25288,73 +25178,6 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable
     return status;
 }
 
-Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint)
-{
-    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);
-}
-
-Protocols::InteractionModel::Status Set(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(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
@@ -25375,129 +25198,8 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
     return status;
 }
 
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return Protocols::InteractionModel::Status::ConstraintError;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_INT16U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ 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);
-}
-
 } // namespace Tolerance
 
-namespace FeatureMap {
-
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return Protocols::InteractionModel::Status::ConstraintError;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-
-Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_BITMAP32_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value)
-{
-    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);
-}
-
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return Protocols::InteractionModel::Status::ConstraintError;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return Protocols::InteractionModel::Status::ConstraintError;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::TemperatureMeasurement::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_INT16U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ 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);
-}
-
-} // namespace ClusterRevision
-
 } // namespace Attributes
 } // namespace TemperatureMeasurement
 
@@ -28008,53 +27710,6 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value)
 
 } // namespace AudioContextDetected
 
-namespace SimultaneousDetectionLimit {
-
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
-    Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return Protocols::InteractionModel::Status::ConstraintError;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-
-Protocols::InteractionModel::Status Set(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(ConcreteAttributePath(endpoint, Clusters::AmbientContextSensing::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_INT8U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
-}
-
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value)
-{
-    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::AmbientContextSensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
-}
-
-} // namespace SimultaneousDetectionLimit
-
 namespace ObjectCountReached {
 
 Protocols::InteractionModel::Status Get(EndpointId endpoint, bool * value)
@@ -28102,7 +27757,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value)
 
 } // namespace ObjectCountReached
 
-namespace HoldTime {
+namespace ObjectCount {
 
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
 {
@@ -28147,13 +27802,13 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value)
     return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace HoldTime
+} // namespace ObjectCount
 
-namespace FeatureMap {
+namespace SimultaneousDetectionLimit {
 
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
+Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     Protocols::InteractionModel::Status status =
@@ -28167,9 +27822,9 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
     return status;
 }
 
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return Protocols::InteractionModel::Status::ConstraintError;
@@ -28178,12 +27833,12 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, Mar
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
     return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::AmbientContextSensing::Id, Id),
-                                 EmberAfWriteDataInput(writable, ZCL_BITMAP32_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
+                                 EmberAfWriteDataInput(writable, ZCL_INT8U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
 }
 
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value)
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return Protocols::InteractionModel::Status::ConstraintError;
@@ -28191,12 +27846,12 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace SimultaneousDetectionLimit
 
-namespace ClusterRevision {
+namespace HoldTime {
 
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
 {
@@ -28241,13 +27896,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value)
     return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace AmbientContextSensing
-
-namespace WiFiNetworkManagement {
-namespace Attributes {
+} // namespace HoldTime
 
 namespace FeatureMap {
 
@@ -28257,7 +27906,7 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, readable, sizeof(temp));
+        emberAfReadAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -28277,7 +27926,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, Mar
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::WiFiNetworkManagement::Id, Id),
+    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::AmbientContextSensing::Id, Id),
                                  EmberAfWriteDataInput(writable, ZCL_BITMAP32_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
 }
 
@@ -28291,7 +27940,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -28304,7 +27953,7 @@ Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     Protocols::InteractionModel::Status status =
-        emberAfReadAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, readable, sizeof(temp));
+        emberAfReadAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -28324,7 +27973,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, Mar
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::WiFiNetworkManagement::Id, Id),
+    return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::AmbientContextSensing::Id, Id),
                                  EmberAfWriteDataInput(writable, ZCL_INT16U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty));
 }
 
@@ -28338,7 +27987,53 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::AmbientContextSensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace AmbientContextSensing
+
+namespace WiFiNetworkManagement {
+namespace Attributes {
+
+namespace FeatureMap {
+
+Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
+    Protocols::InteractionModel::Status status =
+        emberAfReadAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
+    Protocols::InteractionModel::Status status =
+        emberAfReadAttribute(endpoint, Clusters::WiFiNetworkManagement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
 
 } // namespace ClusterRevision
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 40e280b2248..7e1c79b6c22 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
@@ -1502,6 +1502,12 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value);
 Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace ExpiryDate
 
+namespace Unmounted {
+Protocols::InteractionModel::Status Get(EndpointId endpoint, bool * value); // boolean
+Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
+} // namespace Unmounted
+
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value);
@@ -3970,57 +3976,18 @@ Get(EndpointId endpoint,
 namespace TemperatureMeasurement {
 namespace Attributes {
 
-namespace MeasuredValue {
-Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
-                                        MarkAttributeDirty markDirty);
-} // namespace MeasuredValue
-
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
-                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint);
-Protocols::InteractionModel::Status SetNull(EndpointId endpoint, MarkAttributeDirty markDirty);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
-                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
-namespace FeatureMap {
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value); // bitmap32
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
-} // namespace ClusterRevision
-
 } // namespace Attributes
 } // namespace TemperatureMeasurement
 
@@ -4435,18 +4402,24 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value);
 Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace AudioContextDetected
 
-namespace SimultaneousDetectionLimit {
-Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value); // int8u
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
-} // namespace SimultaneousDetectionLimit
-
 namespace ObjectCountReached {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value);
 Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace ObjectCountReached
 
+namespace ObjectCount {
+Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
+} // namespace ObjectCount
+
+namespace SimultaneousDetectionLimit {
+Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value); // int8u
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
+} // namespace SimultaneousDetectionLimit
+
 namespace HoldTime {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value);
@@ -4473,14 +4446,10 @@ namespace Attributes {
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value); // bitmap32
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value);
-Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/AttributeIds.h b/zzz_generated/app-common/clusters/AmbientContextSensing/AttributeIds.h
index 10703f78bc5..9455816c6a6 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/AttributeIds.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/AttributeIds.h
@@ -14,7 +14,7 @@ namespace AmbientContextSensing {
 namespace Attributes {
 
 // Total number of attributes supported by the cluster, including global attributes
-inline constexpr uint32_t kAttributesCount = 15;
+inline constexpr uint32_t kAttributesCount = 17;
 
 namespace HumanActivityDetected {
 inline constexpr AttributeId Id = 0x00000000;
@@ -36,24 +36,32 @@ namespace AmbientContextTypeSupported {
 inline constexpr AttributeId Id = 0x00000004;
 } // namespace AmbientContextTypeSupported
 
-namespace SimultaneousDetectionLimit {
+namespace ObjectCountReached {
 inline constexpr AttributeId Id = 0x00000005;
-} // namespace SimultaneousDetectionLimit
+} // namespace ObjectCountReached
 
-namespace ObjectCountReached {
+namespace ObjectCountConfig {
 inline constexpr AttributeId Id = 0x00000006;
-} // namespace ObjectCountReached
+} // namespace ObjectCountConfig
 
-namespace HoldTime {
+namespace ObjectCount {
 inline constexpr AttributeId Id = 0x00000007;
+} // namespace ObjectCount
+
+namespace SimultaneousDetectionLimit {
+inline constexpr AttributeId Id = 0x00000008;
+} // namespace SimultaneousDetectionLimit
+
+namespace HoldTime {
+inline constexpr AttributeId Id = 0x00000009;
 } // namespace HoldTime
 
 namespace HoldTimeLimits {
-inline constexpr AttributeId Id = 0x00000008;
+inline constexpr AttributeId Id = 0x0000000A;
 } // namespace HoldTimeLimits
 
 namespace PredictedActivity {
-inline constexpr AttributeId Id = 0x00000009;
+inline constexpr AttributeId Id = 0x0000000B;
 } // namespace PredictedActivity
 
 namespace GeneratedCommandList {
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.h b/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.h
index ada52cc4a81..da2a8c8dca2 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.h
@@ -108,18 +108,6 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AmbientContextTypeSupported
-namespace SimultaneousDetectionLimit {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SimultaneousDetectionLimit::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SimultaneousDetectionLimit
 namespace ObjectCountReached {
 struct TypeInfo
 {
@@ -132,6 +120,42 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ObjectCountReached
+namespace ObjectCountConfig {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type;
+    using DecodableType    = chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::DecodableType &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ObjectCountConfig::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ObjectCountConfig
+namespace ObjectCount {
+struct TypeInfo
+{
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ObjectCount::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ObjectCount
+namespace SimultaneousDetectionLimit {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SimultaneousDetectionLimit::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SimultaneousDetectionLimit
 namespace HoldTime {
 struct TypeInfo
 {
@@ -215,8 +239,10 @@ struct TypeInfo
         Attributes::AudioContextDetected::TypeInfo::DecodableType audioContextDetected   = static_cast<bool>(0);
         Attributes::AmbientContextType::TypeInfo::DecodableType ambientContextType;
         Attributes::AmbientContextTypeSupported::TypeInfo::DecodableType ambientContextTypeSupported;
+        Attributes::ObjectCountReached::TypeInfo::DecodableType objectCountReached = static_cast<bool>(0);
+        Attributes::ObjectCountConfig::TypeInfo::DecodableType objectCountConfig;
+        Attributes::ObjectCount::TypeInfo::DecodableType objectCount                               = static_cast<uint16_t>(0);
         Attributes::SimultaneousDetectionLimit::TypeInfo::DecodableType simultaneousDetectionLimit = static_cast<uint8_t>(0);
-        Attributes::ObjectCountReached::TypeInfo::DecodableType objectCountReached                 = static_cast<bool>(0);
         Attributes::HoldTime::TypeInfo::DecodableType holdTime                                     = static_cast<uint16_t>(0);
         Attributes::HoldTimeLimits::TypeInfo::DecodableType holdTimeLimits;
         Attributes::PredictedActivity::TypeInfo::DecodableType predictedActivity;
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.ipp b/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.ipp
index 82f1e1325ed..5b8ec5d2eb0 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.ipp
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Attributes.ipp
@@ -42,10 +42,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, ambientContextType);
     case Attributes::AmbientContextTypeSupported::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, ambientContextTypeSupported);
-    case Attributes::SimultaneousDetectionLimit::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, simultaneousDetectionLimit);
     case Attributes::ObjectCountReached::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, objectCountReached);
+    case Attributes::ObjectCountConfig::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, objectCountConfig);
+    case Attributes::ObjectCount::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, objectCount);
+    case Attributes::SimultaneousDetectionLimit::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, simultaneousDetectionLimit);
     case Attributes::HoldTime::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, holdTime);
     case Attributes::HoldTimeLimits::TypeInfo::GetAttributeId():
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/EventIds.h b/zzz_generated/app-common/clusters/AmbientContextSensing/EventIds.h
index 5095aa76ac0..ce2774c47ef 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/EventIds.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/EventIds.h
@@ -11,9 +11,13 @@ namespace app {
 namespace Clusters {
 namespace AmbientContextSensing {
 namespace Events {
-namespace AmbientContextDetected {
+namespace AmbientContextDetectStarted {
 inline constexpr EventId Id = 0x00000000;
-} // namespace AmbientContextDetected
+} // namespace AmbientContextDetectStarted
+
+namespace AmbientContextDetectEnded {
+inline constexpr EventId Id = 0x00000001;
+} // namespace AmbientContextDetectEnded
 
 } // namespace Events
 } // namespace AmbientContextSensing
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Events.h b/zzz_generated/app-common/clusters/AmbientContextSensing/Events.h
index 3b9e265e5d2..ac0dfbd129c 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Events.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Events.h
@@ -43,23 +43,25 @@ namespace app {
 namespace Clusters {
 namespace AmbientContextSensing {
 namespace Events {
-namespace AmbientContextDetected {
+namespace AmbientContextDetectStarted {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
     kAmbientContextType = 0,
+    kObjectCount        = 1,
 };
 
 struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AmbientContextDetected::Id; }
+    static constexpr EventId GetEventId() { return Events::AmbientContextDetectStarted::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DataModel::List<const Structs::AmbientContextTypeStruct::Type> ambientContextType;
+    Optional<DataModel::List<const Structs::AmbientContextTypeStruct::Type>> ambientContextType;
+    Optional<uint16_t> objectCount;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -68,14 +70,48 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AmbientContextDetected::Id; }
+    static constexpr EventId GetEventId() { return Events::AmbientContextDetectStarted::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
 
-    DataModel::DecodableList<Structs::AmbientContextTypeStruct::DecodableType> ambientContextType;
+    Optional<DataModel::DecodableList<Structs::AmbientContextTypeStruct::DecodableType>> ambientContextType;
+    Optional<uint16_t> objectCount;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AmbientContextDetected
+} // namespace AmbientContextDetectStarted
+namespace AmbientContextDetectEnded {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    kStartEventNumber = 0,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AmbientContextDetectEnded::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    chip::EventNumber startEventNumber = static_cast<chip::EventNumber>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::AmbientContextDetectEnded::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AmbientContextSensing::Id; }
+
+    chip::EventNumber startEventNumber = static_cast<chip::EventNumber>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace AmbientContextDetectEnded
 } // namespace Events
 } // namespace AmbientContextSensing
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Events.ipp b/zzz_generated/app-common/clusters/AmbientContextSensing/Events.ipp
index a1b8cd7f2cc..1e45f84fb33 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Events.ipp
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Events.ipp
@@ -30,12 +30,13 @@ namespace app {
 namespace Clusters {
 namespace AmbientContextSensing {
 namespace Events {
-namespace AmbientContextDetected {
+namespace AmbientContextDetectStarted {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAmbientContextType), ambientContextType));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kObjectCount), objectCount));
     return aWriter.EndContainer(outer);
 }
 
@@ -53,6 +54,41 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, ambientContextType);
         }
+        else if (__context_tag == to_underlying(Fields::kObjectCount))
+        {
+            err = DataModel::Decode(reader, objectCount);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+} // namespace AmbientContextDetectStarted.
+namespace AmbientContextDetectEnded {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kStartEventNumber), startEventNumber));
+    return aWriter.EndContainer(outer);
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        uint8_t __context_tag = 0;
+        CHIP_ERROR err        = __iterator.Next(__context_tag);
+        VerifyOrReturnError(err != CHIP_ERROR_END_OF_TLV, CHIP_NO_ERROR);
+        ReturnErrorOnFailure(err);
+
+        if (__context_tag == to_underlying(Fields::kStartEventNumber))
+        {
+            err = DataModel::Decode(reader, startEventNumber);
+        }
         else
         {
         }
@@ -60,7 +96,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace AmbientContextDetected.
+} // namespace AmbientContextDetectEnded.
 } // namespace Events
 } // namespace AmbientContextSensing
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Metadata.h b/zzz_generated/app-common/clusters/AmbientContextSensing/Metadata.h
index 90c8d219fad..b811b202c6d 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Metadata.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Metadata.h
@@ -45,15 +45,23 @@ inline constexpr DataModel::AttributeEntry
                    BitFlags<DataModel::AttributeQualityFlags>(DataModel::AttributeQualityFlags::kListAttribute),
                    Access::Privilege::kView, std::nullopt);
 } // namespace AmbientContextTypeSupported
+namespace ObjectCountReached {
+inline constexpr DataModel::AttributeEntry kMetadataEntry(ObjectCountReached::Id, BitFlags<DataModel::AttributeQualityFlags>(),
+                                                          Access::Privilege::kView, std::nullopt);
+} // namespace ObjectCountReached
+namespace ObjectCountConfig {
+inline constexpr DataModel::AttributeEntry kMetadataEntry(ObjectCountConfig::Id, BitFlags<DataModel::AttributeQualityFlags>(),
+                                                          Access::Privilege::kView, Access::Privilege::kManage);
+} // namespace ObjectCountConfig
+namespace ObjectCount {
+inline constexpr DataModel::AttributeEntry kMetadataEntry(ObjectCount::Id, BitFlags<DataModel::AttributeQualityFlags>(),
+                                                          Access::Privilege::kView, std::nullopt);
+} // namespace ObjectCount
 namespace SimultaneousDetectionLimit {
 inline constexpr DataModel::AttributeEntry kMetadataEntry(SimultaneousDetectionLimit::Id,
                                                           BitFlags<DataModel::AttributeQualityFlags>(), Access::Privilege::kView,
                                                           Access::Privilege::kOperate);
 } // namespace SimultaneousDetectionLimit
-namespace ObjectCountReached {
-inline constexpr DataModel::AttributeEntry kMetadataEntry(ObjectCountReached::Id, BitFlags<DataModel::AttributeQualityFlags>(),
-                                                          Access::Privilege::kView, std::nullopt);
-} // namespace ObjectCountReached
 namespace HoldTime {
 inline constexpr DataModel::AttributeEntry kMetadataEntry(HoldTime::Id, BitFlags<DataModel::AttributeQualityFlags>(),
                                                           Access::Privilege::kView, Access::Privilege::kManage);
@@ -80,9 +88,12 @@ constexpr std::array<DataModel::AttributeEntry, 3> kMandatoryMetadata = {
 namespace Commands {} // namespace Commands
 
 namespace Events {
-namespace AmbientContextDetected {
+namespace AmbientContextDetectStarted {
+inline constexpr DataModel::EventEntry kMetadataEntry{ Access::Privilege::kView };
+} // namespace AmbientContextDetectStarted
+namespace AmbientContextDetectEnded {
 inline constexpr DataModel::EventEntry kMetadataEntry{ Access::Privilege::kView };
-} // namespace AmbientContextDetected
+} // namespace AmbientContextDetectEnded
 
 } // namespace Events
 } // namespace AmbientContextSensing
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/MetadataProvider.h b/zzz_generated/app-common/clusters/AmbientContextSensing/MetadataProvider.h
index e615cae6afa..504c3e8f535 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/MetadataProvider.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/MetadataProvider.h
@@ -33,10 +33,14 @@ struct ClusterMetadataProvider<DataModel::AttributeEntry, Clusters::AmbientConte
             return AmbientContextType::kMetadataEntry;
         case AmbientContextTypeSupported::Id:
             return AmbientContextTypeSupported::kMetadataEntry;
-        case SimultaneousDetectionLimit::Id:
-            return SimultaneousDetectionLimit::kMetadataEntry;
         case ObjectCountReached::Id:
             return ObjectCountReached::kMetadataEntry;
+        case ObjectCountConfig::Id:
+            return ObjectCountConfig::kMetadataEntry;
+        case ObjectCount::Id:
+            return ObjectCount::kMetadataEntry;
+        case SimultaneousDetectionLimit::Id:
+            return SimultaneousDetectionLimit::kMetadataEntry;
         case HoldTime::Id:
             return HoldTime::kMetadataEntry;
         case HoldTimeLimits::Id:
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.h b/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.h
index 68fdf50d254..4bdaf5a8fed 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.h
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.h
@@ -42,8 +42,6 @@ enum class Fields : uint8_t
 {
     kAmbientContextSensed = 0,
     kDetectionStartTime   = 1,
-    kObjectCountThreshold = 2,
-    kObjectCount          = 3,
 };
 
 struct Type
@@ -51,8 +49,6 @@ struct Type
 public:
     DataModel::List<const Globals::Structs::SemanticTagStruct::Type> ambientContextSensed;
     Optional<uint32_t> detectionStartTime;
-    Optional<uint16_t> objectCountThreshold;
-    Optional<uint16_t> objectCount;
 
     static constexpr bool kIsFabricScoped = false;
 
@@ -64,8 +60,6 @@ struct DecodableType
 public:
     DataModel::DecodableList<Globals::Structs::SemanticTagStruct::DecodableType> ambientContextSensed;
     Optional<uint32_t> detectionStartTime;
-    Optional<uint16_t> objectCountThreshold;
-    Optional<uint16_t> objectCount;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -98,6 +92,29 @@ struct Type
 using DecodableType = Type;
 
 } // namespace HoldTimeLimitsStruct
+namespace ObjectCountConfigStruct {
+enum class Fields : uint8_t
+{
+    kCountingObject       = 0,
+    kObjectCountThreshold = 1,
+};
+
+struct Type
+{
+public:
+    Globals::Structs::SemanticTagStruct::Type countingObject;
+    uint16_t objectCountThreshold = static_cast<uint16_t>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace ObjectCountConfigStruct
 namespace PredictedActivityStruct {
 enum class Fields : uint8_t
 {
diff --git a/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.ipp b/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.ipp
index cc3e6fb2314..815e75c88c0 100644
--- a/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.ipp
+++ b/zzz_generated/app-common/clusters/AmbientContextSensing/Structs.ipp
@@ -35,8 +35,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kAmbientContextSensed), ambientContextSensed);
     encoder.Encode(to_underlying(Fields::kDetectionStartTime), detectionStartTime);
-    encoder.Encode(to_underlying(Fields::kObjectCountThreshold), objectCountThreshold);
-    encoder.Encode(to_underlying(Fields::kObjectCount), objectCount);
     return encoder.Finalize();
 }
 
@@ -58,14 +56,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, detectionStartTime);
         }
-        else if (__context_tag == to_underlying(Fields::kObjectCountThreshold))
-        {
-            err = DataModel::Decode(reader, objectCountThreshold);
-        }
-        else if (__context_tag == to_underlying(Fields::kObjectCount))
-        {
-            err = DataModel::Decode(reader, objectCount);
-        }
 
         ReturnErrorOnFailure(err);
     }
@@ -112,6 +102,40 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
 } // namespace HoldTimeLimitsStruct
 
+namespace ObjectCountConfigStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kCountingObject), countingObject);
+    encoder.Encode(to_underlying(Fields::kObjectCountThreshold), objectCountThreshold);
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        uint8_t __context_tag = 0;
+        CHIP_ERROR err        = __iterator.Next(__context_tag);
+        VerifyOrReturnError(err != CHIP_ERROR_END_OF_TLV, CHIP_NO_ERROR);
+        ReturnErrorOnFailure(err);
+
+        if (__context_tag == to_underlying(Fields::kCountingObject))
+        {
+            err = DataModel::Decode(reader, countingObject);
+        }
+        else if (__context_tag == to_underlying(Fields::kObjectCountThreshold))
+        {
+            err = DataModel::Decode(reader, objectCountThreshold);
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+
+} // namespace ObjectCountConfigStruct
+
 namespace PredictedActivityStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
diff --git a/zzz_generated/app-common/clusters/GeneralDiagnostics/Enums.h b/zzz_generated/app-common/clusters/GeneralDiagnostics/Enums.h
index 5243ace6819..39b45b36841 100644
--- a/zzz_generated/app-common/clusters/GeneralDiagnostics/Enums.h
+++ b/zzz_generated/app-common/clusters/GeneralDiagnostics/Enums.h
@@ -116,7 +116,6 @@ enum class RadioFaultEnum : uint8_t
 enum class Feature : uint32_t
 {
     kDataModelTest = 0x1,
-    kDeviceLoad    = 0x2,
 };
 } // namespace GeneralDiagnostics
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/AttributeIds.h b/zzz_generated/app-common/clusters/GroupKeyManagement/AttributeIds.h
index 6c71927ad25..0dc2874bb89 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/AttributeIds.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/AttributeIds.h
@@ -14,7 +14,7 @@ namespace GroupKeyManagement {
 namespace Attributes {
 
 // Total number of attributes supported by the cluster, including global attributes
-inline constexpr uint32_t kAttributesCount = 9;
+inline constexpr uint32_t kAttributesCount = 10;
 
 namespace GroupKeyMap {
 inline constexpr AttributeId Id = 0x00000000;
@@ -32,6 +32,10 @@ namespace MaxGroupKeysPerFabric {
 inline constexpr AttributeId Id = 0x00000003;
 } // namespace MaxGroupKeysPerFabric
 
+namespace GroupcastAdoption {
+inline constexpr AttributeId Id = 0x00000004;
+} // namespace GroupcastAdoption
+
 namespace GeneratedCommandList {
 inline constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.h b/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.h
index f4dfcb9a6a5..b1d3c728b2d 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.h
@@ -95,6 +95,20 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace MaxGroupKeysPerFabric
+namespace GroupcastAdoption {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<
+        chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::GroupcastAdoption::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace GroupcastAdoption
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -138,6 +152,7 @@ struct TypeInfo
         Attributes::GroupTable::TypeInfo::DecodableType groupTable;
         Attributes::MaxGroupsPerFabric::TypeInfo::DecodableType maxGroupsPerFabric       = static_cast<uint16_t>(0);
         Attributes::MaxGroupKeysPerFabric::TypeInfo::DecodableType maxGroupKeysPerFabric = static_cast<uint16_t>(0);
+        Attributes::GroupcastAdoption::TypeInfo::DecodableType groupcastAdoption;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.ipp b/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.ipp
index c3bc5df6578..70644641637 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.ipp
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Attributes.ipp
@@ -40,6 +40,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, maxGroupsPerFabric);
     case Attributes::MaxGroupKeysPerFabric::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, maxGroupKeysPerFabric);
+    case Attributes::GroupcastAdoption::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, groupcastAdoption);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Enums.h b/zzz_generated/app-common/clusters/GroupKeyManagement/Enums.h
index 24b338ffbc6..4c16eba5e2f 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Enums.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Enums.h
@@ -28,6 +28,18 @@ namespace app {
 namespace Clusters {
 namespace GroupKeyManagement {
 
+// Enum for GroupKeyMulticastPolicyEnum
+enum class GroupKeyMulticastPolicyEnum : uint8_t
+{
+    kPerGroupID = 0x00,
+    kAllNodes   = 0x01,
+    // All received enum values that are not listed above will be mapped
+    // to kUnknownEnumValue. This is a helper enum value that should only
+    // be used by code to process how it handles receiving and unknown
+    // enum value. This specific should never be transmitted.
+    kUnknownEnumValue = 2,
+};
+
 // Enum for GroupKeySecurityPolicyEnum
 enum class GroupKeySecurityPolicyEnum : uint8_t
 {
@@ -44,6 +56,7 @@ enum class GroupKeySecurityPolicyEnum : uint8_t
 enum class Feature : uint32_t
 {
     kCacheAndSync = 0x1,
+    kGroupcast    = 0x2,
 };
 } // namespace GroupKeyManagement
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/EnumsCheck.h b/zzz_generated/app-common/clusters/GroupKeyManagement/EnumsCheck.h
index d6d3f4232f3..e8e80b74b20 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/EnumsCheck.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/EnumsCheck.h
@@ -25,6 +25,18 @@
 namespace chip {
 namespace app {
 namespace Clusters {
+static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::GroupKeyMulticastPolicyEnum val)
+{
+    using EnumType = GroupKeyManagement::GroupKeyMulticastPolicyEnum;
+    switch (val)
+    {
+    case EnumType::kPerGroupID:
+    case EnumType::kAllNodes:
+        return val;
+    default:
+        return EnumType::kUnknownEnumValue;
+    }
+}
 static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::GroupKeySecurityPolicyEnum val)
 {
     using EnumType = GroupKeyManagement::GroupKeySecurityPolicyEnum;
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Metadata.h b/zzz_generated/app-common/clusters/GroupKeyManagement/Metadata.h
index 07d5717edd3..82880a365c3 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Metadata.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Metadata.h
@@ -17,7 +17,7 @@ namespace app {
 namespace Clusters {
 namespace GroupKeyManagement {
 
-inline constexpr uint32_t kRevision = 2;
+inline constexpr uint32_t kRevision = 3;
 
 namespace Attributes {
 
@@ -39,6 +39,12 @@ namespace MaxGroupKeysPerFabric {
 inline constexpr DataModel::AttributeEntry kMetadataEntry(MaxGroupKeysPerFabric::Id, BitFlags<DataModel::AttributeQualityFlags>(),
                                                           Access::Privilege::kView, std::nullopt);
 } // namespace MaxGroupKeysPerFabric
+namespace GroupcastAdoption {
+inline constexpr DataModel::AttributeEntry
+    kMetadataEntry(GroupcastAdoption::Id,
+                   BitFlags<DataModel::AttributeQualityFlags>(DataModel::AttributeQualityFlags::kListAttribute),
+                   Access::Privilege::kAdminister, Access::Privilege::kAdminister);
+} // namespace GroupcastAdoption
 constexpr std::array<DataModel::AttributeEntry, 4> kMandatoryMetadata = {
     GroupKeyMap::kMetadataEntry,
     GroupTable::kMetadataEntry,
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/MetadataProvider.h b/zzz_generated/app-common/clusters/GroupKeyManagement/MetadataProvider.h
index 6438ee3aad2..697dc99a6b1 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/MetadataProvider.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/MetadataProvider.h
@@ -31,6 +31,8 @@ struct ClusterMetadataProvider<DataModel::AttributeEntry, Clusters::GroupKeyMana
             return MaxGroupsPerFabric::kMetadataEntry;
         case MaxGroupKeysPerFabric::Id:
             return MaxGroupKeysPerFabric::kMetadataEntry;
+        case GroupcastAdoption::Id:
+            return GroupcastAdoption::kMetadataEntry;
         default:
             return std::nullopt;
         }
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.h b/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.h
index 8760553ee71..0b266c31f5e 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.h
@@ -121,14 +121,15 @@ using DecodableType = Type;
 namespace GroupKeySetStruct {
 enum class Fields : uint8_t
 {
-    kGroupKeySetID          = 0,
-    kGroupKeySecurityPolicy = 1,
-    kEpochKey0              = 2,
-    kEpochStartTime0        = 3,
-    kEpochKey1              = 4,
-    kEpochStartTime1        = 5,
-    kEpochKey2              = 6,
-    kEpochStartTime2        = 7,
+    kGroupKeySetID           = 0,
+    kGroupKeySecurityPolicy  = 1,
+    kEpochKey0               = 2,
+    kEpochStartTime0         = 3,
+    kEpochKey1               = 4,
+    kEpochStartTime1         = 5,
+    kEpochKey2               = 6,
+    kEpochStartTime2         = 7,
+    kGroupKeyMulticastPolicy = 8,
 };
 
 struct Type
@@ -142,6 +143,7 @@ struct Type
     DataModel::Nullable<uint64_t> epochStartTime1;
     DataModel::Nullable<chip::ByteSpan> epochKey2;
     DataModel::Nullable<uint64_t> epochStartTime2;
+    GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = static_cast<GroupKeyMulticastPolicyEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -153,6 +155,37 @@ struct Type
 using DecodableType = Type;
 
 } // namespace GroupKeySetStruct
+namespace GroupcastAdoptionStruct {
+enum class Fields : uint8_t
+{
+    kGroupcastAdopted = 0,
+    kFabricIndex      = 254,
+};
+
+struct Type
+{
+public:
+    bool groupcastAdopted         = static_cast<bool>(0);
+    chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = true;
+
+    auto GetFabricIndex() const { return fabricIndex; }
+
+    void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; }
+
+    CHIP_ERROR EncodeForWrite(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR EncodeForRead(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
+
+private:
+    CHIP_ERROR DoEncode(TLV::TLVWriter & aWriter, TLV::Tag aTag, const Optional<FabricIndex> & aAccessingFabricIndex) const;
+};
+
+using DecodableType = Type;
+
+} // namespace GroupcastAdoptionStruct
 } // namespace Structs
 } // namespace GroupKeyManagement
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.ipp b/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.ipp
index 7757f32f2d0..0e0dfe44da9 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.ipp
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Structs.ipp
@@ -156,6 +156,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     encoder.Encode(to_underlying(Fields::kEpochStartTime1), epochStartTime1);
     encoder.Encode(to_underlying(Fields::kEpochKey2), epochKey2);
     encoder.Encode(to_underlying(Fields::kEpochStartTime2), epochStartTime2);
+    encoder.Encode(to_underlying(Fields::kGroupKeyMulticastPolicy), groupKeyMulticastPolicy);
     return encoder.Finalize();
 }
 
@@ -201,12 +202,66 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             err = DataModel::Decode(reader, epochStartTime2);
         }
+        else if (__context_tag == to_underlying(Fields::kGroupKeyMulticastPolicy))
+        {
+            err = DataModel::Decode(reader, groupKeyMulticastPolicy);
+        }
 
         ReturnErrorOnFailure(err);
     }
 }
 
 } // namespace GroupKeySetStruct
+
+namespace GroupcastAdoptionStruct {
+CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    return DoEncode(aWriter, aTag, NullOptional);
+}
+
+CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const
+{
+    return DoEncode(aWriter, aTag, MakeOptional(aAccessingFabricIndex));
+}
+
+CHIP_ERROR Type::DoEncode(TLV::TLVWriter & aWriter, TLV::Tag aTag, const Optional<FabricIndex> & aAccessingFabricIndex) const
+{
+
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+
+    encoder.Encode(to_underlying(Fields::kGroupcastAdopted), groupcastAdopted);
+    if (aAccessingFabricIndex.HasValue())
+    {
+        encoder.Encode(to_underlying(Fields::kFabricIndex), fabricIndex);
+    }
+
+    return encoder.Finalize();
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    detail::StructDecodeIterator __iterator(reader);
+    while (true)
+    {
+        uint8_t __context_tag = 0;
+        CHIP_ERROR err        = __iterator.Next(__context_tag);
+        VerifyOrReturnError(err != CHIP_ERROR_END_OF_TLV, CHIP_NO_ERROR);
+        ReturnErrorOnFailure(err);
+
+        if (__context_tag == to_underlying(Fields::kGroupcastAdopted))
+        {
+            err = DataModel::Decode(reader, groupcastAdopted);
+        }
+        else if (__context_tag == to_underlying(Fields::kFabricIndex))
+        {
+            err = DataModel::Decode(reader, fabricIndex);
+        }
+
+        ReturnErrorOnFailure(err);
+    }
+}
+
+} // namespace GroupcastAdoptionStruct
 } // namespace Structs
 } // namespace GroupKeyManagement
 } // namespace Clusters
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/AttributeIds.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/AttributeIds.h
index 7cb9a8f63e0..12ad09ca660 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/AttributeIds.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/AttributeIds.h
@@ -14,7 +14,7 @@ namespace SmokeCoAlarm {
 namespace Attributes {
 
 // Total number of attributes supported by the cluster, including global attributes
-inline constexpr uint32_t kAttributesCount = 18;
+inline constexpr uint32_t kAttributesCount = 19;
 
 namespace ExpressedState {
 inline constexpr AttributeId Id = 0x00000000;
@@ -68,6 +68,10 @@ namespace ExpiryDate {
 inline constexpr AttributeId Id = 0x0000000C;
 } // namespace ExpiryDate
 
+namespace Unmounted {
+inline constexpr AttributeId Id = 0x0000000D;
+} // namespace Unmounted
+
 namespace GeneratedCommandList {
 inline constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.h
index 1bceae3f071..78336b06b61 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.h
@@ -199,6 +199,18 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ExpiryDate
+namespace Unmounted {
+struct TypeInfo
+{
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Unmounted::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Unmounted
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -260,6 +272,7 @@ struct TypeInfo
         Attributes::SmokeSensitivityLevel::TypeInfo::DecodableType smokeSensitivityLevel =
             static_cast<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>(0);
         Attributes::ExpiryDate::TypeInfo::DecodableType expiryDate = static_cast<uint32_t>(0);
+        Attributes::Unmounted::TypeInfo::DecodableType unmounted   = static_cast<bool>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.ipp b/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.ipp
index 0f1fa97ca16..1212ce7d63f 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.ipp
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/Attributes.ipp
@@ -58,6 +58,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, smokeSensitivityLevel);
     case Attributes::ExpiryDate::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, expiryDate);
+    case Attributes::Unmounted::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, unmounted);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/Enums.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/Enums.h
index 215be8d68e0..35f39060f08 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/Enums.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/Enums.h
@@ -79,11 +79,12 @@ enum class ExpressedStateEnum : uint8_t
     kEndOfService      = 0x06,
     kInterconnectSmoke = 0x07,
     kInterconnectCO    = 0x08,
+    kInoperative       = 0x09,
     // All received enum values that are not listed above will be mapped
     // to kUnknownEnumValue. This is a helper enum value that should only
     // be used by code to process how it handles receiving and unknown
     // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 9,
+    kUnknownEnumValue = 10,
 };
 
 // Enum for MuteStateEnum
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/EnumsCheck.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/EnumsCheck.h
index 5f75c7944f9..53ffb89e706 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/EnumsCheck.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/EnumsCheck.h
@@ -78,6 +78,7 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(SmokeCoAlarm::Expressed
     case EnumType::kEndOfService:
     case EnumType::kInterconnectSmoke:
     case EnumType::kInterconnectCO:
+    case EnumType::kInoperative:
         return val;
     default:
         return EnumType::kUnknownEnumValue;
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/Metadata.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/Metadata.h
index c082e425a42..fe89b1939c8 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/Metadata.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/Metadata.h
@@ -17,7 +17,7 @@ namespace app {
 namespace Clusters {
 namespace SmokeCoAlarm {
 
-inline constexpr uint32_t kRevision = 1;
+inline constexpr uint32_t kRevision = 2;
 
 namespace Attributes {
 
@@ -73,6 +73,10 @@ namespace ExpiryDate {
 inline constexpr DataModel::AttributeEntry kMetadataEntry(ExpiryDate::Id, BitFlags<DataModel::AttributeQualityFlags>(),
                                                           Access::Privilege::kView, std::nullopt);
 } // namespace ExpiryDate
+namespace Unmounted {
+inline constexpr DataModel::AttributeEntry kMetadataEntry(Unmounted::Id, BitFlags<DataModel::AttributeQualityFlags>(),
+                                                          Access::Privilege::kView, std::nullopt);
+} // namespace Unmounted
 constexpr std::array<DataModel::AttributeEntry, 5> kMandatoryMetadata = {
     ExpressedState::kMetadataEntry,     BatteryAlert::kMetadataEntry,      TestInProgress::kMetadataEntry,
     HardwareFaultAlert::kMetadataEntry, EndOfServiceAlert::kMetadataEntry,
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/MetadataProvider.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/MetadataProvider.h
index e274b8026e7..c8246b13c4c 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/MetadataProvider.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/MetadataProvider.h
@@ -49,6 +49,8 @@ struct ClusterMetadataProvider<DataModel::AttributeEntry, Clusters::SmokeCoAlarm
             return SmokeSensitivityLevel::kMetadataEntry;
         case ExpiryDate::Id:
             return ExpiryDate::kMetadataEntry;
+        case Unmounted::Id:
+            return Unmounted::kMetadataEntry;
         default:
             return std::nullopt;
         }
diff --git a/zzz_generated/app-common/devices/Ids.h b/zzz_generated/app-common/devices/Ids.h
index 32c4542a9b3..224a40cb8b1 100644
--- a/zzz_generated/app-common/devices/Ids.h
+++ b/zzz_generated/app-common/devices/Ids.h
@@ -54,7 +54,7 @@ constexpr DeviceTypeId kContactSensorDeviceTypeId  = 0x00000015;
 constexpr uint8_t kContactSensorDeviceTypeRevision = 2;
 
 constexpr DeviceTypeId kRootNodeDeviceTypeId  = 0x00000016;
-constexpr uint8_t kRootNodeDeviceTypeRevision = 4;
+constexpr uint8_t kRootNodeDeviceTypeRevision = 5;
 
 constexpr DeviceTypeId kSolarPowerDeviceTypeId  = 0x00000017;
 constexpr uint8_t kSolarPowerDeviceTypeRevision = 1;
@@ -156,7 +156,7 @@ constexpr DeviceTypeId kThreadBorderRouterDeviceTypeId  = 0x00000091;
 constexpr uint8_t kThreadBorderRouterDeviceTypeRevision = 1;
 
 constexpr DeviceTypeId kOnOffLightDeviceTypeId  = 0x00000100;
-constexpr uint8_t kOnOffLightDeviceTypeRevision = 3;
+constexpr uint8_t kOnOffLightDeviceTypeRevision = 4;
 
 constexpr DeviceTypeId kDimmableLightDeviceTypeId  = 0x00000101;
 constexpr uint8_t kDimmableLightDeviceTypeRevision = 3;
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index fbb4c6af29a..3c3ca56ca2e 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -4116,6 +4116,7 @@ class OperationalCredentialsSignVIDVerificationRequest : public ClusterCommand
 | * GroupTable                                                        | 0x0001 |
 | * MaxGroupsPerFabric                                                | 0x0002 |
 | * MaxGroupKeysPerFabric                                             | 0x0003 |
+| * GroupcastAdoption                                                 | 0x0004 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -5327,6 +5328,7 @@ class DishwasherModeChangeToMode : public ClusterCommand
 | * ContaminationState                                                | 0x000A |
 | * SmokeSensitivityLevel                                             | 0x000B |
 | * ExpiryDate                                                        | 0x000C |
+| * Unmounted                                                         | 0x000D |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -11584,11 +11586,13 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | * AudioContextDetected                                              | 0x0002 |
 | * AmbientContextType                                                | 0x0003 |
 | * AmbientContextTypeSupported                                       | 0x0004 |
-| * SimultaneousDetectionLimit                                        | 0x0005 |
-| * ObjectCountReached                                                | 0x0006 |
-| * HoldTime                                                          | 0x0007 |
-| * HoldTimeLimits                                                    | 0x0008 |
-| * PredictedActivity                                                 | 0x0009 |
+| * ObjectCountReached                                                | 0x0005 |
+| * ObjectCountConfig                                                 | 0x0006 |
+| * ObjectCount                                                       | 0x0007 |
+| * SimultaneousDetectionLimit                                        | 0x0008 |
+| * HoldTime                                                          | 0x0009 |
+| * HoldTimeLimits                                                    | 0x000A |
+| * PredictedActivity                                                 | 0x000B |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -11596,7 +11600,8 @@ class ColorControlStepColorTemperature : public ClusterCommand
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * AmbientContextDetected                                            | 0x0000 |
+| * AmbientContextDetectStarted                                       | 0x0000 |
+| * AmbientContextDetectEnded                                         | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
@@ -22324,6 +22329,7 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
         make_unique<ReadAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig),        //
         make_unique<ReadAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "groupcast-adoption", Attributes::GroupcastAdoption::Id, credsIssuerConfig),            //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
         make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
@@ -22340,6 +22346,9 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "max-group-keys-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupKeysPerFabric::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type>>>(
+            Id, "groupcast-adoption", Attributes::GroupcastAdoption::Id, WriteCommandType::kWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -22357,6 +22366,7 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
         make_unique<SubscribeAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id,
                                         credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "groupcast-adoption", Attributes::GroupcastAdoption::Id, credsIssuerConfig),        //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                //
@@ -23674,6 +23684,7 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),          //
         make_unique<ReadAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "unmounted", Attributes::Unmounted::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),     //
         make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),       //
         make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                    //
@@ -23712,6 +23723,8 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands *
             credsIssuerConfig), //
         make_unique<WriteAttribute<uint32_t>>(Id, "expiry-date", 0, UINT32_MAX, Attributes::ExpiryDate::Id,
                                               WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "unmounted", 0, 1, Attributes::Unmounted::Id, WriteCommandType::kForceWrite,
+                                          credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -23738,6 +23751,7 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands *
         make_unique<SubscribeAttribute>(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig),        //
         make_unique<SubscribeAttribute>(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "unmounted", Attributes::Unmounted::Id, credsIssuerConfig),                           //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),     //
         make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                  //
@@ -29401,10 +29415,12 @@ void registerClusterAmbientContextSensing(Commands & commands, CredentialIssuerC
         make_unique<ReadAttribute>(Id, "audio-context-detected", Attributes::AudioContextDetected::Id, credsIssuerConfig),   //
         make_unique<ReadAttribute>(Id, "ambient-context-type", Attributes::AmbientContextType::Id, credsIssuerConfig),       //
         make_unique<ReadAttribute>(Id, "ambient-context-type-supported", Attributes::AmbientContextTypeSupported::Id,
-                                   credsIssuerConfig), //
+                                   credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "object-count-reached", Attributes::ObjectCountReached::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "object-count-config", Attributes::ObjectCountConfig::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "object-count", Attributes::ObjectCount::Id, credsIssuerConfig),                //
         make_unique<ReadAttribute>(Id, "simultaneous-detection-limit", Attributes::SimultaneousDetectionLimit::Id,
                                    credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "object-count-reached", Attributes::ObjectCountReached::Id, credsIssuerConfig),     //
         make_unique<ReadAttribute>(Id, "hold-time", Attributes::HoldTime::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "hold-time-limits", Attributes::HoldTimeLimits::Id, credsIssuerConfig),             //
         make_unique<ReadAttribute>(Id, "predicted-activity", Attributes::PredictedActivity::Id, credsIssuerConfig),        //
@@ -29427,11 +29443,15 @@ void registerClusterAmbientContextSensing(Commands & commands, CredentialIssuerC
             chip::app::DataModel::List<const chip::app::Clusters::Globals::Structs::SemanticTagStruct::Type>>>(
             Id, "ambient-context-type-supported", Attributes::AmbientContextTypeSupported::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
+        make_unique<WriteAttribute<bool>>(Id, "object-count-reached", 0, 1, Attributes::ObjectCountReached::Id,
+                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttributeAsComplex<chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type>>(
+            Id, "object-count-config", Attributes::ObjectCountConfig::Id, WriteCommandType::kWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "object-count", 0, UINT16_MAX, Attributes::ObjectCount::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint8_t>>(Id, "simultaneous-detection-limit", 0, UINT8_MAX,
                                              Attributes::SimultaneousDetectionLimit::Id, WriteCommandType::kWrite,
                                              credsIssuerConfig), //
-        make_unique<WriteAttribute<bool>>(Id, "object-count-reached", 0, 1, Attributes::ObjectCountReached::Id,
-                                          WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttribute<uint16_t>>(Id, "hold-time", 0, UINT16_MAX, Attributes::HoldTime::Id, WriteCommandType::kWrite,
                                               credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::Clusters::AmbientContextSensing::Structs::HoldTimeLimitsStruct::Type>>(
@@ -29456,10 +29476,12 @@ void registerClusterAmbientContextSensing(Commands & commands, CredentialIssuerC
         make_unique<SubscribeAttribute>(Id, "audio-context-detected", Attributes::AudioContextDetected::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "ambient-context-type", Attributes::AmbientContextType::Id, credsIssuerConfig),       //
         make_unique<SubscribeAttribute>(Id, "ambient-context-type-supported", Attributes::AmbientContextTypeSupported::Id,
-                                        credsIssuerConfig), //
+                                        credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "object-count-reached", Attributes::ObjectCountReached::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "object-count-config", Attributes::ObjectCountConfig::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "object-count", Attributes::ObjectCount::Id, credsIssuerConfig),                //
         make_unique<SubscribeAttribute>(Id, "simultaneous-detection-limit", Attributes::SimultaneousDetectionLimit::Id,
                                         credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "object-count-reached", Attributes::ObjectCountReached::Id, credsIssuerConfig),     //
         make_unique<SubscribeAttribute>(Id, "hold-time", Attributes::HoldTime::Id, credsIssuerConfig),                          //
         make_unique<SubscribeAttribute>(Id, "hold-time-limits", Attributes::HoldTimeLimits::Id, credsIssuerConfig),             //
         make_unique<SubscribeAttribute>(Id, "predicted-activity", Attributes::PredictedActivity::Id, credsIssuerConfig),        //
@@ -29471,10 +29493,14 @@ void registerClusterAmbientContextSensing(Commands & commands, CredentialIssuerC
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadEvent>(Id, "ambient-context-detected", Events::AmbientContextDetected::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeEvent>(Id, "ambient-context-detected", Events::AmbientContextDetected::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                            //
+        make_unique<ReadEvent>(Id, "ambient-context-detect-started", Events::AmbientContextDetectStarted::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, "ambient-context-detect-ended", Events::AmbientContextDetectEnded::Id, credsIssuerConfig),     //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                       //
+        make_unique<SubscribeEvent>(Id, "ambient-context-detect-started", Events::AmbientContextDetectStarted::Id,
+                                    credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "ambient-context-detect-ended", Events::AmbientContextDetectEnded::Id,
+                                    credsIssuerConfig), //
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 3f1183d4e8c..19541f5318d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -2774,6 +2774,8 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
         ComplexArgumentParser::EnsureMemberExist("GroupKeySetStruct.epochKey2", "epochKey2", value.isMember("epochKey2")));
     ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("GroupKeySetStruct.epochStartTime2", "epochStartTime2",
                                                                   value.isMember("epochStartTime2")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist(
+        "GroupKeySetStruct.groupKeyMulticastPolicy", "groupKeyMulticastPolicy", value.isMember("groupKeyMulticastPolicy")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupKeySetID");
@@ -2809,6 +2811,11 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.epochStartTime2, value["epochStartTime2"]));
     valueCopy.removeMember("epochStartTime2");
 
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupKeyMulticastPolicy");
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::Setup(labelWithMember, request.groupKeyMulticastPolicy, value["groupKeyMulticastPolicy"]));
+    valueCopy.removeMember("groupKeyMulticastPolicy");
+
     return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
 }
 
@@ -2822,6 +2829,40 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::St
     ComplexArgumentParser::Finalize(request.epochStartTime1);
     ComplexArgumentParser::Finalize(request.epochKey2);
     ComplexArgumentParser::Finalize(request.epochStartTime2);
+    ComplexArgumentParser::Finalize(request.groupKeyMulticastPolicy);
+}
+
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
+                                        chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type & request,
+                                        Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("GroupcastAdoptionStruct.groupcastAdopted", "groupcastAdopted",
+                                                                  value.isMember("groupcastAdopted")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupcastAdopted");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.groupcastAdopted, value["groupcastAdopted"]));
+    valueCopy.removeMember("groupcastAdopted");
+
+    if (value.isMember("fabricIndex"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"]));
+    }
+    valueCopy.removeMember("fabricIndex");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.groupcastAdopted);
+    ComplexArgumentParser::Finalize(request.fabricIndex);
 }
 
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
@@ -5381,21 +5422,6 @@ ComplexArgumentParser::Setup(const char * label,
     }
     valueCopy.removeMember("detectionStartTime");
 
-    if (value.isMember("objectCountThreshold"))
-    {
-        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "objectCountThreshold");
-        ReturnErrorOnFailure(
-            ComplexArgumentParser::Setup(labelWithMember, request.objectCountThreshold, value["objectCountThreshold"]));
-    }
-    valueCopy.removeMember("objectCountThreshold");
-
-    if (value.isMember("objectCount"))
-    {
-        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "objectCount");
-        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.objectCount, value["objectCount"]));
-    }
-    valueCopy.removeMember("objectCount");
-
     return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
 }
 
@@ -5403,8 +5429,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::AmbientContextSensing:
 {
     ComplexArgumentParser::Finalize(request.ambientContextSensed);
     ComplexArgumentParser::Finalize(request.detectionStartTime);
-    ComplexArgumentParser::Finalize(request.objectCountThreshold);
-    ComplexArgumentParser::Finalize(request.objectCount);
 }
 
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
@@ -5446,6 +5470,40 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::AmbientContextSensing:
     ComplexArgumentParser::Finalize(request.holdTimeDefault);
 }
 
+CHIP_ERROR
+ComplexArgumentParser::Setup(const char * label,
+                             chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type & request,
+                             Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Copy to track which members we already processed.
+    Json::Value valueCopy(value);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ObjectCountConfigStruct.countingObject", "countingObject",
+                                                                  value.isMember("countingObject")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ObjectCountConfigStruct.objectCountThreshold",
+                                                                  "objectCountThreshold", value.isMember("objectCountThreshold")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "countingObject");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.countingObject, value["countingObject"]));
+    valueCopy.removeMember("countingObject");
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "objectCountThreshold");
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::Setup(labelWithMember, request.objectCountThreshold, value["objectCountThreshold"]));
+    valueCopy.removeMember("objectCountThreshold");
+
+    return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
+}
+
+void ComplexArgumentParser::Finalize(chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.countingObject);
+    ComplexArgumentParser::Finalize(request.objectCountThreshold);
+}
+
 CHIP_ERROR
 ComplexArgumentParser::Setup(const char * label,
                              chip::app::Clusters::AmbientContextSensing::Structs::PredictedActivityStruct::Type & request,
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 09f9122b35e..e92d2ddf6a7 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -320,6 +320,12 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GroupKeyManagem
 
 static void Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type & request);
 
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type & request);
+
 static CHIP_ERROR Setup(const char * label,
                         chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::Type & request,
                         Json::Value & value);
@@ -604,6 +610,12 @@ static CHIP_ERROR Setup(const char * label,
 
 static void Finalize(chip::app::Clusters::AmbientContextSensing::Structs::HoldTimeLimitsStruct::Type & request);
 
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type & request);
+
 static CHIP_ERROR Setup(const char * label,
                         chip::app::Clusters::AmbientContextSensing::Structs::PredictedActivityStruct::Type & request,
                         Json::Value & value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 7b7b1999af0..65b8aaec4df 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -2543,6 +2543,40 @@ DataModelLogger::LogValue(const char * label, size_t indent,
             return err;
         }
     }
+    {
+        CHIP_ERROR err = LogValue("GroupKeyMulticastPolicy", indent + 1, value.groupKeyMulticastPolicy);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupKeyMulticastPolicy'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = LogValue("GroupcastAdopted", indent + 1, value.groupcastAdopted);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupcastAdopted'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
@@ -4786,22 +4820,6 @@ CHIP_ERROR DataModelLogger::LogValue(
             return err;
         }
     }
-    {
-        CHIP_ERROR err = LogValue("ObjectCountThreshold", indent + 1, value.objectCountThreshold);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ObjectCountThreshold'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("ObjectCount", indent + 1, value.objectCount);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ObjectCount'");
-            return err;
-        }
-    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
@@ -4841,6 +4859,32 @@ DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = LogValue("CountingObject", indent + 1, value.countingObject);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CountingObject'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("ObjectCountThreshold", indent + 1, value.objectCountThreshold);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ObjectCountThreshold'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR
 DataModelLogger::LogValue(const char * label, size_t indent,
                           const chip::app::Clusters::AmbientContextSensing::Structs::PredictedActivityStruct::DecodableType & value)
@@ -11517,7 +11561,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const AmbientContextSensing::Events::AmbientContextDetected::DecodableType & value)
+                                     const AmbientContextSensing::Events::AmbientContextDetectStarted::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -11528,6 +11572,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
             return err;
         }
     }
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("ObjectCount", indent + 1, value.objectCount);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ObjectCount'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const AmbientContextSensing::Events::AmbientContextDetectEnded::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        CHIP_ERROR err = DataModelLogger::LogValue("StartEventNumber", indent + 1, value.startEventNumber);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'StartEventNumber'");
+            return err;
+        }
+    }
     DataModelLogger::LogString(indent, "}");
 
     return CHIP_NO_ERROR;
@@ -15448,6 +15516,13 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("MaxGroupKeysPerFabric", 1, value);
         }
+        case GroupKeyManagement::Attributes::GroupcastAdoption::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::DecodableType>
+                value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GroupcastAdoption", 1, value);
+        }
         case GroupKeyManagement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -16485,6 +16560,11 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ExpiryDate", 1, value);
         }
+        case SmokeCoAlarm::Attributes::Unmounted::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Unmounted", 1, value);
+        }
         case SmokeCoAlarm::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -21090,16 +21170,26 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AmbientContextTypeSupported", 1, value);
         }
-        case AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SimultaneousDetectionLimit", 1, value);
-        }
         case AmbientContextSensing::Attributes::ObjectCountReached::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ObjectCountReached", 1, value);
         }
+        case AmbientContextSensing::Attributes::ObjectCountConfig::Id: {
+            chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ObjectCountConfig", 1, value);
+        }
+        case AmbientContextSensing::Attributes::ObjectCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ObjectCount", 1, value);
+        }
+        case AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SimultaneousDetectionLimit", 1, value);
+        }
         case AmbientContextSensing::Attributes::HoldTime::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -25435,10 +25525,15 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
     case AmbientContextSensing::Id: {
         switch (header.mPath.mEventId)
         {
-        case AmbientContextSensing::Events::AmbientContextDetected::Id: {
-            chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetected::DecodableType value;
+        case AmbientContextSensing::Events::AmbientContextDetectStarted::Id: {
+            chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetectStarted::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AmbientContextDetectStarted", 1, value);
+        }
+        case AmbientContextSensing::Events::AmbientContextDetectEnded::Id: {
+            chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetectEnded::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AmbientContextDetected", 1, value);
+            return DataModelLogger::LogValue("AmbientContextDetectEnded", 1, value);
         }
         }
         break;
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 90e05993ed9..8d6a0059087 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -199,6 +199,9 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::DecodableType & value);
 
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::DecodableType & value);
+
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::DecodableType & value);
 
@@ -370,6 +373,10 @@ LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::AmbientContextSensing::Structs::HoldTimeLimitsStruct::DecodableType & value);
 
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::DecodableType & value);
+
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::AmbientContextSensing::Structs::PredictedActivityStruct::DecodableType & value);
@@ -956,8 +963,12 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Thermostat::Events::ActivePresetChange::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::OccupancySensing::Events::OccupancyChanged::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetected::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetectStarted::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::AmbientContextSensing::Events::AmbientContextDetectEnded::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::TargetNavigator::Events::TargetUpdated::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
index 6e21d18b1cf..a12d1bddf08 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -1393,6 +1393,8 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id)
             return "MaxGroupsPerFabric";
         case chip::app::Clusters::GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id:
             return "MaxGroupKeysPerFabric";
+        case chip::app::Clusters::GroupKeyManagement::Attributes::GroupcastAdoption::Id:
+            return "GroupcastAdoption";
         case chip::app::Clusters::GroupKeyManagement::Attributes::GeneratedCommandList::Id:
             return "GeneratedCommandList";
         case chip::app::Clusters::GroupKeyManagement::Attributes::AcceptedCommandList::Id:
@@ -1905,6 +1907,8 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id)
             return "SmokeSensitivityLevel";
         case chip::app::Clusters::SmokeCoAlarm::Attributes::ExpiryDate::Id:
             return "ExpiryDate";
+        case chip::app::Clusters::SmokeCoAlarm::Attributes::Unmounted::Id:
+            return "Unmounted";
         case chip::app::Clusters::SmokeCoAlarm::Attributes::GeneratedCommandList::Id:
             return "GeneratedCommandList";
         case chip::app::Clusters::SmokeCoAlarm::Attributes::AcceptedCommandList::Id:
@@ -3969,10 +3973,14 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id)
             return "AmbientContextType";
         case chip::app::Clusters::AmbientContextSensing::Attributes::AmbientContextTypeSupported::Id:
             return "AmbientContextTypeSupported";
-        case chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id:
-            return "SimultaneousDetectionLimit";
         case chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountReached::Id:
             return "ObjectCountReached";
+        case chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountConfig::Id:
+            return "ObjectCountConfig";
+        case chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCount::Id:
+            return "ObjectCount";
+        case chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id:
+            return "SimultaneousDetectionLimit";
         case chip::app::Clusters::AmbientContextSensing::Attributes::HoldTime::Id:
             return "HoldTime";
         case chip::app::Clusters::AmbientContextSensing::Attributes::HoldTimeLimits::Id:
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 09a1d44d548..e723808367c 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -41570,6 +41570,7 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public Subscribe
 | * GroupTable                                                        | 0x0001 |
 | * MaxGroupsPerFabric                                                | 0x0002 |
 | * MaxGroupKeysPerFabric                                             | 0x0003 |
+| * GroupcastAdoption                                                 | 0x0004 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -41636,6 +41637,7 @@ class GroupKeyManagementKeySetWrite : public ClusterCommand {
         } else {
             params.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime2.Value()];
         }
+        params.groupKeySet.groupKeyMulticastPolicy = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.groupKeySet.groupKeyMulticastPolicy)];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -42201,6 +42203,150 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public Subscri
     }
 };
 
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute GroupcastAdoption
+ */
+class ReadGroupKeyManagementGroupcastAdoption : public ReadAttribute {
+public:
+    ReadGroupKeyManagementGroupcastAdoption()
+        : ReadAttribute("groupcast-adoption")
+    {
+    }
+
+    ~ReadGroupKeyManagementGroupcastAdoption()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GroupKeyManagement::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::GroupKeyManagement::Attributes::GroupcastAdoption::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRReadParams alloc] init];
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        [cluster readAttributeGroupcastAdoptionWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.GroupcastAdoption response %@", [value description]);
+            if (error == nil) {
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("GroupKeyManagement GroupcastAdoption read Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteGroupKeyManagementGroupcastAdoption : public WriteAttribute {
+public:
+    WriteGroupKeyManagementGroupcastAdoption()
+        : WriteAttribute("groupcast-adoption")
+        , mComplex(&mValue)
+    {
+        AddArgument("attr-name", "groupcast-adoption");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteGroupKeyManagementGroupcastAdoption()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GroupKeyManagement::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::GroupKeyManagement::Attributes::GroupcastAdoption::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                MTRGroupKeyManagementClusterGroupcastAdoptionStruct * newElement_0;
+                newElement_0 = [MTRGroupKeyManagementClusterGroupcastAdoptionStruct new];
+                newElement_0.groupcastAdopted = [NSNumber numberWithBool:entry_0.groupcastAdopted];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
+
+        [cluster writeAttributeGroupcastAdoptionWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("GroupKeyManagement GroupcastAdoption write Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupcastAdoptionStruct::Type>> mComplex;
+};
+
+class SubscribeAttributeGroupKeyManagementGroupcastAdoption : public SubscribeAttribute {
+public:
+    SubscribeAttributeGroupKeyManagementGroupcastAdoption()
+        : SubscribeAttribute("groupcast-adoption")
+    {
+    }
+
+    ~SubscribeAttributeGroupKeyManagementGroupcastAdoption()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::GroupKeyManagement::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::GroupKeyManagement::Attributes::GroupcastAdoption::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeGroupcastAdoptionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GroupcastAdoption response %@", [value description]);
+                if (error == nil) {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -56150,6 +56296,7 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 | * ContaminationState                                                | 0x000A |
 | * SmokeSensitivityLevel                                             | 0x000B |
 | * ExpiryDate                                                        | 0x000C |
+| * Unmounted                                                         | 0x000D |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -57321,6 +57468,92 @@ class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
     }
 };
 
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Unmounted
+ */
+class ReadSmokeCoAlarmUnmounted : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmUnmounted()
+        : ReadAttribute("unmounted")
+    {
+    }
+
+    ~ReadSmokeCoAlarmUnmounted()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::Unmounted::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeUnmountedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SmokeCOAlarm.Unmounted response %@", [value description]);
+            if (error == nil) {
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("SmokeCOAlarm Unmounted read Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeSmokeCoAlarmUnmounted : public SubscribeAttribute {
+public:
+    SubscribeAttributeSmokeCoAlarmUnmounted()
+        : SubscribeAttribute("unmounted")
+    {
+    }
+
+    ~SubscribeAttributeSmokeCoAlarmUnmounted()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::SmokeCoAlarm::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::Unmounted::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeUnmountedWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.Unmounted response %@", [value description]);
+                if (error == nil) {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -138836,11 +139069,13 @@ class SubscribeAttributeSoilMeasurementClusterRevision : public SubscribeAttribu
 | * AudioContextDetected                                              | 0x0002 |
 | * AmbientContextType                                                | 0x0003 |
 | * AmbientContextTypeSupported                                       | 0x0004 |
-| * SimultaneousDetectionLimit                                        | 0x0005 |
-| * ObjectCountReached                                                | 0x0006 |
-| * HoldTime                                                          | 0x0007 |
-| * HoldTimeLimits                                                    | 0x0008 |
-| * PredictedActivity                                                 | 0x0009 |
+| * ObjectCountReached                                                | 0x0005 |
+| * ObjectCountConfig                                                 | 0x0006 |
+| * ObjectCount                                                       | 0x0007 |
+| * SimultaneousDetectionLimit                                        | 0x0008 |
+| * HoldTime                                                          | 0x0009 |
+| * HoldTimeLimits                                                    | 0x000A |
+| * PredictedActivity                                                 | 0x000B |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -138848,7 +139083,8 @@ class SubscribeAttributeSoilMeasurementClusterRevision : public SubscribeAttribu
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * AmbientContextDetected                                            | 0x0000 |
+| * AmbientContextDetectStarted                                       | 0x0000 |
+| * AmbientContextDetectEnded                                         | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
@@ -139279,34 +139515,34 @@ class SubscribeAttributeAmbientContextSensingAmbientContextTypeSupported : publi
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SimultaneousDetectionLimit
+ * Attribute ObjectCountReached
  */
-class ReadAmbientContextSensingSimultaneousDetectionLimit : public ReadAttribute {
+class ReadAmbientContextSensingObjectCountReached : public ReadAttribute {
 public:
-    ReadAmbientContextSensingSimultaneousDetectionLimit()
-        : ReadAttribute("simultaneous-detection-limit")
+    ReadAmbientContextSensingObjectCountReached()
+        : ReadAttribute("object-count-reached")
     {
     }
 
-    ~ReadAmbientContextSensingSimultaneousDetectionLimit()
+    ~ReadAmbientContextSensingObjectCountReached()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountReached::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
         __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSimultaneousDetectionLimitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AmbientContextSensing.SimultaneousDetectionLimit response %@", [value description]);
+        [cluster readAttributeObjectCountReachedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AmbientContextSensing.ObjectCountReached response %@", [value description]);
             if (error == nil) {
                 TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AmbientContextSensing SimultaneousDetectionLimit read Error", error);
+                LogNSError("AmbientContextSensing ObjectCountReached read Error", error);
                 TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -139315,24 +139551,110 @@ class ReadAmbientContextSensingSimultaneousDetectionLimit : public ReadAttribute
     }
 };
 
-class WriteAmbientContextSensingSimultaneousDetectionLimit : public WriteAttribute {
+class SubscribeAttributeAmbientContextSensingObjectCountReached : public SubscribeAttribute {
 public:
-    WriteAmbientContextSensingSimultaneousDetectionLimit()
-        : WriteAttribute("simultaneous-detection-limit")
+    SubscribeAttributeAmbientContextSensingObjectCountReached()
+        : SubscribeAttribute("object-count-reached")
     {
-        AddArgument("attr-name", "simultaneous-detection-limit");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+    }
+
+    ~SubscribeAttributeAmbientContextSensingObjectCountReached()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountReached::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeObjectCountReachedWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AmbientContextSensing.ObjectCountReached response %@", [value description]);
+                if (error == nil) {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ObjectCountConfig
+ */
+class ReadAmbientContextSensingObjectCountConfig : public ReadAttribute {
+public:
+    ReadAmbientContextSensingObjectCountConfig()
+        : ReadAttribute("object-count-config")
+    {
+    }
+
+    ~ReadAmbientContextSensingObjectCountConfig()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountConfig::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeObjectCountConfigWithCompletion:^(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AmbientContextSensing.ObjectCountConfig response %@", [value description]);
+            if (error == nil) {
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("AmbientContextSensing ObjectCountConfig read Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteAmbientContextSensingObjectCountConfig : public WriteAttribute {
+public:
+    WriteAmbientContextSensingObjectCountConfig()
+        : WriteAttribute("object-count-config")
+        , mComplex(&mValue)
+    {
+        AddArgument("attr-name", "object-count-config");
+        AddArgument("attr-value", &mComplex);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteAmbientContextSensingSimultaneousDetectionLimit()
+    ~WriteAmbientContextSensingObjectCountConfig()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountConfig::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
@@ -139340,11 +139662,30 @@ class WriteAmbientContextSensingSimultaneousDetectionLimit : public WriteAttribu
         __auto_type * params = [[MTRWriteParams alloc] init];
         params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nonnull value;
+        value = [MTRAmbientContextSensingClusterObjectCountConfigStruct new];
+        value.countingObject = [MTRDataTypeSemanticTagStruct new];
+        if (mValue.countingObject.mfgCode.IsNull()) {
+            value.countingObject.mfgCode = nil;
+        } else {
+            value.countingObject.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(mValue.countingObject.mfgCode.Value())];
+        }
+        value.countingObject.namespaceID = [NSNumber numberWithUnsignedChar:mValue.countingObject.namespaceID];
+        value.countingObject.tag = [NSNumber numberWithUnsignedChar:mValue.countingObject.tag];
+        if (mValue.countingObject.label.HasValue()) {
+            if (mValue.countingObject.label.Value().IsNull()) {
+                value.countingObject.label = nil;
+            } else {
+                value.countingObject.label = [[NSString alloc] initWithBytes:mValue.countingObject.label.Value().Value().data() length:mValue.countingObject.label.Value().Value().size() encoding:NSUTF8StringEncoding];
+            }
+        } else {
+            value.countingObject.label = nil;
+        }
+        value.objectCountThreshold = [NSNumber numberWithUnsignedShort:mValue.objectCountThreshold];
 
-        [cluster writeAttributeSimultaneousDetectionLimitWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeObjectCountConfigWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("AmbientContextSensing SimultaneousDetectionLimit write Error", error);
+                LogNSError("AmbientContextSensing ObjectCountConfig write Error", error);
                 TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -139353,24 +139694,25 @@ class WriteAmbientContextSensingSimultaneousDetectionLimit : public WriteAttribu
     }
 
 private:
-    uint8_t mValue;
+    chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type mValue;
+    TypedComplexArgument<chip::app::Clusters::AmbientContextSensing::Structs::ObjectCountConfigStruct::Type> mComplex;
 };
 
-class SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit : public SubscribeAttribute {
+class SubscribeAttributeAmbientContextSensingObjectCountConfig : public SubscribeAttribute {
 public:
-    SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit()
-        : SubscribeAttribute("simultaneous-detection-limit")
+    SubscribeAttributeAmbientContextSensingObjectCountConfig()
+        : SubscribeAttribute("object-count-config")
     {
     }
 
-    ~SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit()
+    ~SubscribeAttributeAmbientContextSensingObjectCountConfig()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountConfig::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
@@ -139385,10 +139727,95 @@ class SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSimultaneousDetectionLimitWithParams:params
+        [cluster subscribeAttributeObjectCountConfigWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(MTRAmbientContextSensingClusterObjectCountConfigStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AmbientContextSensing.ObjectCountConfig response %@", [value description]);
+                if (error == nil) {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute ObjectCount
+ */
+class ReadAmbientContextSensingObjectCount : public ReadAttribute {
+public:
+    ReadAmbientContextSensingObjectCount()
+        : ReadAttribute("object-count")
+    {
+    }
+
+    ~ReadAmbientContextSensingObjectCount()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCount::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeObjectCountWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AmbientContextSensing.ObjectCount response %@", [value description]);
+            if (error == nil) {
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("AmbientContextSensing ObjectCount read Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeAmbientContextSensingObjectCount : public SubscribeAttribute {
+public:
+    SubscribeAttributeAmbientContextSensingObjectCount()
+        : SubscribeAttribute("object-count")
+    {
+    }
+
+    ~SubscribeAttributeAmbientContextSensingObjectCount()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCount::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+        if (mKeepSubscriptions.HasValue()) {
+            params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
+        }
+        if (mFabricFiltered.HasValue()) {
+            params.filterByFabric = mFabricFiltered.Value();
+        }
+        if (mAutoResubscribe.HasValue()) {
+            params.resubscribeAutomatically = mAutoResubscribe.Value();
+        }
+        [cluster subscribeAttributeObjectCountWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AmbientContextSensing.SimultaneousDetectionLimit response %@", [value description]);
+                NSLog(@"AmbientContextSensing.ObjectCount response %@", [value description]);
                 if (error == nil) {
                     TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -139405,34 +139832,34 @@ class SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ObjectCountReached
+ * Attribute SimultaneousDetectionLimit
  */
-class ReadAmbientContextSensingObjectCountReached : public ReadAttribute {
+class ReadAmbientContextSensingSimultaneousDetectionLimit : public ReadAttribute {
 public:
-    ReadAmbientContextSensingObjectCountReached()
-        : ReadAttribute("object-count-reached")
+    ReadAmbientContextSensingSimultaneousDetectionLimit()
+        : ReadAttribute("simultaneous-detection-limit")
     {
     }
 
-    ~ReadAmbientContextSensingObjectCountReached()
+    ~ReadAmbientContextSensingSimultaneousDetectionLimit()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountReached::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
         __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeObjectCountReachedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AmbientContextSensing.ObjectCountReached response %@", [value description]);
+        [cluster readAttributeSimultaneousDetectionLimitWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AmbientContextSensing.SimultaneousDetectionLimit response %@", [value description]);
             if (error == nil) {
                 TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AmbientContextSensing ObjectCountReached read Error", error);
+                LogNSError("AmbientContextSensing SimultaneousDetectionLimit read Error", error);
                 TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -139441,21 +139868,62 @@ class ReadAmbientContextSensingObjectCountReached : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAmbientContextSensingObjectCountReached : public SubscribeAttribute {
+class WriteAmbientContextSensingSimultaneousDetectionLimit : public WriteAttribute {
 public:
-    SubscribeAttributeAmbientContextSensingObjectCountReached()
-        : SubscribeAttribute("object-count-reached")
+    WriteAmbientContextSensingSimultaneousDetectionLimit()
+        : WriteAttribute("simultaneous-detection-limit")
     {
+        AddArgument("attr-name", "simultaneous-detection-limit");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeAmbientContextSensingObjectCountReached()
+    ~WriteAmbientContextSensingSimultaneousDetectionLimit()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::ObjectCountReached::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        __auto_type * cluster = [[MTRBaseClusterAmbientContextSensing alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * params = [[MTRWriteParams alloc] init];
+        params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSimultaneousDetectionLimitWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("AmbientContextSensing SimultaneousDetectionLimit write Error", error);
+                TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit : public SubscribeAttribute {
+public:
+    SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit()
+        : SubscribeAttribute("simultaneous-detection-limit")
+    {
+    }
+
+    ~SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::AmbientContextSensing::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::AmbientContextSensing::Attributes::SimultaneousDetectionLimit::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
@@ -139470,10 +139938,10 @@ class SubscribeAttributeAmbientContextSensingObjectCountReached : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeObjectCountReachedWithParams:params
+        [cluster subscribeAttributeSimultaneousDetectionLimitWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AmbientContextSensing.ObjectCountReached response %@", [value description]);
+                NSLog(@"AmbientContextSensing.SimultaneousDetectionLimit response %@", [value description]);
                 if (error == nil) {
                     TEMPORARY_RETURN_IGNORED RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -196356,6 +196824,11 @@ void registerClusterGroupKeyManagement(Commands & commands)
         make_unique<SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric>(), //
         make_unique<ReadGroupKeyManagementMaxGroupKeysPerFabric>(), //
         make_unique<SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadGroupKeyManagementGroupcastAdoption>(), //
+        make_unique<WriteGroupKeyManagementGroupcastAdoption>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementGroupcastAdoption>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadGroupKeyManagementGeneratedCommandList>(), //
         make_unique<SubscribeAttributeGroupKeyManagementGeneratedCommandList>(), //
         make_unique<ReadGroupKeyManagementAcceptedCommandList>(), //
@@ -197026,6 +197499,10 @@ void registerClusterSmokeCoAlarm(Commands & commands)
         make_unique<SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel>(), //
         make_unique<ReadSmokeCoAlarmExpiryDate>(), //
         make_unique<SubscribeAttributeSmokeCoAlarmExpiryDate>(), //
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadSmokeCoAlarmUnmounted>(), //
+        make_unique<SubscribeAttributeSmokeCoAlarmUnmounted>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadSmokeCoAlarmGeneratedCommandList>(), //
         make_unique<SubscribeAttributeSmokeCoAlarmGeneratedCommandList>(), //
         make_unique<ReadSmokeCoAlarmAcceptedCommandList>(), //
@@ -200062,15 +200539,24 @@ void registerClusterAmbientContextSensing(Commands & commands)
         make_unique<ReadAmbientContextSensingAmbientContextTypeSupported>(), //
         make_unique<SubscribeAttributeAmbientContextSensingAmbientContextTypeSupported>(), //
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAmbientContextSensingObjectCountReached>(), //
+        make_unique<SubscribeAttributeAmbientContextSensingObjectCountReached>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAmbientContextSensingObjectCountConfig>(), //
+        make_unique<WriteAmbientContextSensingObjectCountConfig>(), //
+        make_unique<SubscribeAttributeAmbientContextSensingObjectCountConfig>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadAmbientContextSensingObjectCount>(), //
+        make_unique<SubscribeAttributeAmbientContextSensingObjectCount>(), //
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadAmbientContextSensingSimultaneousDetectionLimit>(), //
         make_unique<WriteAmbientContextSensingSimultaneousDetectionLimit>(), //
         make_unique<SubscribeAttributeAmbientContextSensingSimultaneousDetectionLimit>(), //
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadAmbientContextSensingObjectCountReached>(), //
-        make_unique<SubscribeAttributeAmbientContextSensingObjectCountReached>(), //
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadAmbientContextSensingHoldTime>(), //
         make_unique<WriteAmbientContextSensingHoldTime>(), //